From 75355b151799e4b9b336f37fa430cbeaa8980c33 Mon Sep 17 00:00:00 2001 From: C10udburst <18114966+C10udburst@users.noreply.github.com> Date: Sat, 6 Aug 2022 15:34:15 +0200 Subject: [PATCH] fix class cast exception? --- build.gradle.kts | 1 + settings.gradle.kts | 2 +- .../cloudstream3/gradle/tasks/Tasks.kt | 17 +++++++++++------ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8597147..6b73a43 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,6 +24,7 @@ dependencies { compileOnly("com.google.guava:guava:30.1.1-jre") compileOnly("com.android.tools:sdk-common:30.0.0") compileOnly("com.android.tools.build:gradle:7.2.2") + compileOnly("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10") implementation("com.github.Aliucord.dex2jar:dex-translator:d5a5efb06c") implementation("com.github.Aliucord.jadx:jadx-core:1a213e978d") diff --git a/settings.gradle.kts b/settings.gradle.kts index 6188782..818fdaa 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1 +1 @@ -rootProject.name = "gradle" \ No newline at end of file +rootProject.name = "gradle" diff --git a/src/main/kotlin/com/lagradost/cloudstream3/gradle/tasks/Tasks.kt b/src/main/kotlin/com/lagradost/cloudstream3/gradle/tasks/Tasks.kt index 8a85a91..f404d25 100644 --- a/src/main/kotlin/com/lagradost/cloudstream3/gradle/tasks/Tasks.kt +++ b/src/main/kotlin/com/lagradost/cloudstream3/gradle/tasks/Tasks.kt @@ -9,6 +9,7 @@ import org.gradle.api.Project import org.gradle.api.tasks.AbstractCopyTask import org.gradle.api.tasks.bundling.Zip import org.gradle.api.tasks.compile.AbstractCompile +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile const val TASK_GROUP = "cloudstream" @@ -27,12 +28,16 @@ fun registerTasks(project: Project) { it.pluginClassFile.set(pluginClassFile) - for (name in arrayOf("compileDebugJavaWithJavac", "compileDebugKotlin")) { - val task = project.tasks.findByName(name) as AbstractCompile? - if (task != null) { - it.dependsOn(task) - it.input.from(task.destinationDirectory) - } + val kotlinTask = project.tasks.findByName("compileDebugKotlin") as KotlinCompile? + if (kotlinTask != null) { + it.dependsOn(kotlinTask) + it.input.from(kotlinTask.destinationDirectory) + } + + val javacTask = project.tasks.findByName("compileDebugJavaWithJavac") as AbstractCompile? + if (javacTask != null) { + it.dependsOn(javacTask) + it.input.from(javacTask.destinationDirectory) } it.outputFile.set(intermediates.resolve("classes.dex"))