From ce72948a21a82b37770677ce9127552ebefb6767 Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Tue, 2 Aug 2022 17:18:24 +0200 Subject: [PATCH] [Gradle] Remove the system property for compiler execution strategy #KT-51831 Fixed --- .../gradle/tasks/CompileUsingKotlinDaemon.kt | 2 +- .../kotlin/gradle/ExecutionStrategyIT.kt | 35 +------------------ .../gradle.properties | 3 +- .../kotlin/gradle/plugin/KotlinProperties.kt | 14 +------- 4 files changed, 5 insertions(+), 49 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/CompileUsingKotlinDaemon.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/CompileUsingKotlinDaemon.kt index ba33439c4f0..e6f1dfc43fc 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/CompileUsingKotlinDaemon.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/CompileUsingKotlinDaemon.kt @@ -12,7 +12,7 @@ import org.gradle.api.tasks.Internal enum class KotlinCompilerExecutionStrategy( /** - * Value that should be passed for `kotlin.compiler.execution.strategy` Gradle or system property to choose the strategy + * Value that should be passed for `kotlin.compiler.execution.strategy` Gradle property to choose the strategy */ val propertyValue: String ) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExecutionStrategyIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExecutionStrategyIT.kt index 697f0271118..47025a143c8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExecutionStrategyIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExecutionStrategyIT.kt @@ -75,17 +75,6 @@ abstract class ExecutionStrategyIT : KGPDaemonsBaseTest() { ) } - @DisplayName("Compilation via Kotlin daemon enabled using system property") - @GradleTest - fun testDaemonViaSystemProperty(gradleVersion: GradleVersion) { - doTestExecutionStrategy( - gradleVersion, - KotlinCompilerExecutionStrategy.DAEMON, - addHeapDumpOptions = false, - viaSystemProperty = true - ) - } - @DisplayName("Compilation inside Gradle daemon") @GradleTest fun testInProcess(gradleVersion: GradleVersion) { @@ -95,16 +84,6 @@ abstract class ExecutionStrategyIT : KGPDaemonsBaseTest() { ) } - @DisplayName("Compilation inside Gradle daemon enabled using system property") - @GradleTest - fun testInProcessViaSystemProperty(gradleVersion: GradleVersion) { - doTestExecutionStrategy( - gradleVersion, - KotlinCompilerExecutionStrategy.IN_PROCESS, - viaSystemProperty = true - ) - } - @DisplayName("Compilation via separate compiler process") @GradleTest fun testOutOfProcess(gradleVersion: GradleVersion) { @@ -114,21 +93,10 @@ abstract class ExecutionStrategyIT : KGPDaemonsBaseTest() { ) } - @DisplayName("Compilation via separate compiler process enabled via system property") - @GradleTest - fun testOutOfProcessViaSystemProperty(gradleVersion: GradleVersion) { - doTestExecutionStrategy( - gradleVersion, - KotlinCompilerExecutionStrategy.OUT_OF_PROCESS, - viaSystemProperty = true - ) - } - private fun doTestExecutionStrategy( gradleVersion: GradleVersion, executionStrategy: KotlinCompilerExecutionStrategy, addHeapDumpOptions: Boolean = true, - viaSystemProperty: Boolean = false ) { project( projectName = "kotlinBuiltins", @@ -137,8 +105,7 @@ abstract class ExecutionStrategyIT : KGPDaemonsBaseTest() { ) { setupProject(this) - val cliArgPrefix = if (viaSystemProperty) "-D" else "-P" - val strategyCLIArg = "${cliArgPrefix}kotlin.compiler.execution.strategy=${executionStrategy.propertyValue}" + val strategyCLIArg = "-Pkotlin.compiler.execution.strategy=${executionStrategy.propertyValue}" val finishMessage = "Finished executing kotlin compiler using $executionStrategy strategy" build("build", strategyCLIArg) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/Project Path With Spaces/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/Project Path With Spaces/gradle.properties index c2e97feab87..f7c3a9ff903 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/Project Path With Spaces/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/Project Path With Spaces/gradle.properties @@ -1 +1,2 @@ -org.gradle.jvmargs=-Xmx1024m -XX:MaxPermSize=512m -Dkotlin.compiler.execution.strategy="out-of-process" \ No newline at end of file +org.gradle.jvmargs=-Xmx1024m -XX:MaxPermSize=512m +kotlin.compiler.execution.strategy=out-of-process \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt index 48af087b1e4..8984abd47d5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt @@ -417,19 +417,7 @@ internal class PropertiesProvider private constructor(private val project: Proje get() = property("kotlin.daemon.jvmargs") val kotlinCompilerExecutionStrategy: KotlinCompilerExecutionStrategy - get() { - val propertyName = "kotlin.compiler.execution.strategy" - val gradleProperty = property(propertyName) - // system property is for backward compatibility - val value = (gradleProperty ?: System.getProperty(propertyName)?.also { - SingleWarningPerBuild.show( - project, - "The '$propertyName' system property is deprecated and will have no effect since Kotlin 1.8.0. " + - "Please use the '$propertyName' project property or the `compilerExecutionStrategy` Kotlin compile task property instead." - ) - }) - return KotlinCompilerExecutionStrategy.fromProperty(value?.toLowerCase()) - } + get() = KotlinCompilerExecutionStrategy.fromProperty(property("kotlin.compiler.execution.strategy")?.toLowerCase()) private fun propertyWithDeprecatedVariant(propName: String, deprecatedPropName: String): String? { val deprecatedProperty = property(deprecatedPropName)