From b3d8187df45aa192aad57c21add06f2e21450560 Mon Sep 17 00:00:00 2001 From: Ivan Gavrilovic Date: Mon, 26 Apr 2021 16:31:59 +0100 Subject: [PATCH] [Gradle] Remove deprecated ways to specify compiler classpath This change removes options to specify compiler classpath using deprecated properties that were deprecated for more than 2 years. --- .../jetbrains/kotlin/gradle/KotlinDaemonIT.kt | 19 ------------- .../kotlin/gradle/KotlinGradlePluginIT.kt | 17 ----------- .../org/jetbrains/kotlin/gradle/UpToDateIT.kt | 4 +-- .../customCompilerFile/build.gradle | 23 --------------- .../src/main/kotlin/Dummy.kt | 1 - .../jetbrains/kotlin/gradle/tasks/Tasks.kt | 28 ------------------- 6 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/customCompilerFile/build.gradle delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/customCompilerFile/src/main/kotlin/Dummy.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinDaemonIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinDaemonIT.kt index 51d1375cb2a..24e266da88b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinDaemonIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinDaemonIT.kt @@ -103,25 +103,6 @@ class KotlinDaemonIT : BaseGradleIT() { } } - @Test - fun testGradleBuildClasspathShouldNotBeLeakedIntoDaemonClasspathOnUsingCustomCompilerJar() { - val testProject = Project( - projectName = "customCompilerFile", - ) - testProject.setupWorkingDir() - - // copy compiler embeddable into project dir using custom name - val classpath = System.getProperty("java.class.path").split(File.pathSeparator) - val kotlinEmbeddableJar = File(classpath.find { it.contains("kotlin-compiler-embeddable") }!!) - - val compilerJar = File(testProject.projectDir, "compiler.jar") - kotlinEmbeddableJar.copyTo(compilerJar) - - testProject.build("build") { - assertGradleClasspathNotLeaked() - } - } - private fun CompiledProject.assertGradleClasspathNotLeaked() { assertContains("Kotlin compiler classpath:") val daemonClasspath = output.lineSequence().find { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt index 5d7c2453782..dd4f01f6a6b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt @@ -367,23 +367,6 @@ class KotlinGradleIT : BaseGradleIT() { } } - @Test - fun testCustomCompilerFile() { - val project = Project("customCompilerFile") - project.setupWorkingDir() - - // copy compiler embeddable to project dir using custom name - val classpath = System.getProperty("java.class.path").split(File.pathSeparator) - val kotlinEmbeddableJar = File(classpath.find { it.contains("kotlin-compiler-embeddable") }) - val compilerJar = File(project.projectDir, "compiler.jar") - kotlinEmbeddableJar.copyTo(compilerJar) - - project.build("build") { - assertSuccessful() - assertContains("Kotlin compiler classpath: $compilerJar") - } - } - @Test fun testFreeCompilerArgs() { val project = Project("kotlinProject") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UpToDateIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UpToDateIT.kt index 3caa197944c..4e30cedae8c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UpToDateIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UpToDateIT.kt @@ -85,9 +85,9 @@ class UpToDateIT : BaseGradleIT() { buildGradle.appendText("""${'\n'} // Add Kapt to the project to test its input checks as well: apply plugin: 'kotlin-kapt' - compileKotlin.compilerClasspath = files($originalPaths).toList() + compileKotlin.getDefaultCompilerClasspath${'$'}kotlin_gradle_plugin().setFrom(files($originalPaths).toList()) afterEvaluate { - kaptGenerateStubsKotlin.compilerClasspath = files($originalPaths).toList() + kaptGenerateStubsKotlin.getDefaultCompilerClasspath${'$'}kotlin_gradle_plugin().setFrom(files($originalPaths).toList()) } """.trimIndent()) } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/customCompilerFile/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/customCompilerFile/build.gradle deleted file mode 100644 index 1d8128d529b..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/customCompilerFile/build.gradle +++ /dev/null @@ -1,23 +0,0 @@ -buildscript { - repositories { - mavenLocal() - mavenCentral() - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - -apply plugin: "kotlin" - -repositories { - mavenLocal() - mavenCentral() -} - -dependencies { - testImplementation 'junit:junit:4.12' - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" -} - -compileKotlin.compilerJarFile = project.file("compiler.jar") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/customCompilerFile/src/main/kotlin/Dummy.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/customCompilerFile/src/main/kotlin/Dummy.kt deleted file mode 100644 index b5925573e5b..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/customCompilerFile/src/main/kotlin/Dummy.kt +++ /dev/null @@ -1 +0,0 @@ -class Dummy 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 4940213fceb..7aabf68ac60 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 @@ -64,32 +64,6 @@ abstract class AbstractKotlinCompileTool CompilerArgumentAwareWithInput, TaskWithLocalState { - private fun useCompilerClasspathConfigurationMessage(propertyName: String) { - logger.kotlinWarn( - "'$path.$propertyName' is deprecated and will be removed soon. " + - "Use '$COMPILER_CLASSPATH_CONFIGURATION_NAME' " + - "configuration for customizing compiler classpath." - ) - } - - // TODO: remove - @get:Internal - var compilerJarFile: File? = null - @Deprecated("Use $COMPILER_CLASSPATH_CONFIGURATION_NAME configuration") - set(value) { - useCompilerClasspathConfigurationMessage("compilerJarFile") - field = value - } - - // TODO: remove - @get:Internal - var compilerClasspath: List? = null - @Deprecated("Use $COMPILER_CLASSPATH_CONFIGURATION_NAME configuration") - set(value) { - useCompilerClasspathConfigurationMessage("compilerClasspath") - field = value - } - @InputFiles @PathSensitive(PathSensitivity.RELATIVE) override fun getSource() = super.getSource() @@ -114,8 +88,6 @@ abstract class AbstractKotlinCompileTool @get:InputFiles internal val computedCompilerClasspath: FileCollection = project.objects.fileCollection().from({ when { - !compilerClasspath.isNullOrEmpty() -> compilerClasspath!! - compilerJarFile != null -> classpathWithCompilerJar useFallbackCompilerSearch -> findKotlinCompilerClasspath(project) else -> defaultCompilerClasspath }