From b9031f0c680ba3080e22d4f02d502f1291b217b8 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Mon, 18 Nov 2019 16:51:45 +0300 Subject: [PATCH] Fix overrides of removed in gradle 6.0 `AbstractCompile.compile` https://github.com/gradle/gradle/commit/5e7476de957792b6d2f164968b4023539a0385f2 --- .../kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt | 2 +- .../kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt | 2 -- .../main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 4 ---- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt index 23571a19d70..40925dde83c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt @@ -239,7 +239,7 @@ abstract class AbstractKotlinNativeCompile : Abstra buildCompilerArgs() + buildCommonArgs() + buildSourceArgs() @TaskAction - override fun compile() { + open fun compile() { val output = outputFile.get() output.parentFile.mkdirs() KonanCompilerRunner(project).run(buildArgs()) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt index 79afad61e6c..a56292a6e03 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt @@ -63,8 +63,6 @@ open class KotlinJsDce : AbstractKotlinCompileTool(), KotlinJs override fun findKotlinCompilerClasspath(project: Project): List = findKotlinJsDceClasspath(project) - override fun compile() {} - override fun keep(vararg fqn: String) { keep += fqn } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index ac609dc8ea9..31f76b2236f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -259,10 +259,6 @@ abstract class AbstractKotlinCompile() : AbstractKo internal open fun compilerRunner(): GradleCompilerRunner = GradleCompilerRunner(this) - override fun compile() { - assert(false, { "unexpected call to compile()" }) - } - @TaskAction fun execute(inputs: IncrementalTaskInputs) { // If task throws exception, but its outputs are changed during execution,