diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt index 7f484c63964..9252dd0ba04 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt @@ -30,12 +30,6 @@ class K2JVMCompilerArguments : CommonCompilerArguments() { @Argument(value = "-include-runtime", description = "Include Kotlin runtime into the resulting JAR") var includeRuntime: Boolean by FreezableVar(false) - @GradleDeprecatedOption( - message = "This option is not working well with Gradle caching and will be removed in the future.", - removeAfter = "1.7", - level = DeprecationLevel.WARNING - ) - @GradleOption(DefaultValues.StringNullDefault::class) @Argument( value = "-jdk-home", valueDescription = "", diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt index 95513c01500..0fee3e0726e 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt @@ -11,13 +11,6 @@ interface KotlinJvmOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOption */ var javaParameters: kotlin.Boolean - /** - * Include a custom JDK from the specified location into the classpath instead of the default JAVA_HOME - * Default value: null - */ - @Deprecated(message = "This option is not working well with Gradle caching and will be removed in the future.", level = DeprecationLevel.WARNING) - var jdkHome: kotlin.String? - /** * Target version of the generated JVM bytecode (1.6 (DEPRECATED), 1.8, 9, 10, ..., 18), default is 1.8 * Possible values: "1.6", "1.8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt index c1680ae0623..9f3db551e52 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt @@ -28,7 +28,6 @@ class KotlinJavaToolchainTest : KGPBaseTest() { gradleVersion = gradleVersion ) { build("assemble") { - assertOutputDoesNotContain("'kotlinOptions.jdkHome' is deprecated and will be ignored in Kotlin 1.7!") assertJdkHomeIsUsingJdk(getUserJdk().javaHomeRealPath) } } @@ -304,32 +303,6 @@ class KotlinJavaToolchainTest : KGPBaseTest() { } } - @DisplayName("User provided jdkHome Kotlin option should produce deprecation warning on Gradle builds") - @GradleTest - internal fun jdkHomeIsDeprecated(gradleVersion: GradleVersion) { - project( - projectName = "simple".fullProjectName, - gradleVersion = gradleVersion - ) { - //language=Groovy - buildGradle.append( - """ - import org.jetbrains.kotlin.gradle.dsl.KotlinCompile - - tasks.withType(KotlinCompile).configureEach { - kotlinOptions { - jdkHome = "${getJdk9Path()}" - } - } - """.trimIndent() - ) - build("assemble") { - assertJdkHomeIsUsingJdk(getJdk9().javaHomeRealPath) - assertOutputContains("'kotlinOptions.jdkHome' is deprecated and will be ignored in Kotlin 1.7!") - } - } - } - @DisplayName("Should allow to set JDK version for tasks via Java toolchain") @GradleTestVersions @GradleTest diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt index d70ada21a0f..5a94581c29c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt @@ -95,17 +95,6 @@ class SimpleKotlinGradleIT : KGPBaseTest() { } } - @GradleTest - @DisplayName("Should use custom JDK to compile sources") - fun testCustomJdk(gradleVersion: GradleVersion) { - project("customJdk", gradleVersion) { - buildAndFail("build") { - assertOutputContains("Unresolved reference: stream") - assertOutputDoesNotContain("Unresolved reference: AutoCloseable") - } - } - } - @GradleTest @DisplayName("Compile task destination dir should be configured on configuration phase") fun testDestinationDirReferencedDuringEvaluation(gradleVersion: GradleVersion) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/customJdk/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/customJdk/build.gradle deleted file mode 100644 index 5634b00e09a..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/customJdk/build.gradle +++ /dev/null @@ -1,20 +0,0 @@ -plugins { - id "org.jetbrains.kotlin.jvm" -} - -sourceSets { - main { - kotlin { - srcDir 'src' - } - } -} - -repositories { - mavenLocal() - mavenCentral() -} - -compileKotlin { - kotlinOptions.jdkHome = System.getenv("JDK_17") -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/customJdk/src/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/customJdk/src/main.kt deleted file mode 100644 index 7f09733c2a7..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/customJdk/src/main.kt +++ /dev/null @@ -1,9 +0,0 @@ -// available in JDK 1.7 -fun java.lang.AutoCloseable.silentClose() { - -} - -// available in JDK 1.8, should be an error with JDK 1.7 -fun java.util.stream.Stream.count(): Int { - return 0 -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt index 7c3442c3b6b..b74cd377388 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt @@ -44,9 +44,6 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K javaParametersField = value } - @Deprecated(message = "This option is not working well with Gradle caching and will be removed in the future.", level = DeprecationLevel.WARNING) - override var jdkHome: kotlin.String? = null - override var jvmTarget: kotlin.String? = null override var moduleName: kotlin.String? = null @@ -73,7 +70,6 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K languageVersion?.let { args.languageVersion = it } useFirField?.let { args.useFir = it } javaParametersField?.let { args.javaParameters = it } - jdkHome?.let { args.jdkHome = it } jvmTarget?.let { args.jvmTarget = it } moduleName?.let { args.moduleName = it } noJdkField?.let { args.noJdk = it } @@ -89,7 +85,6 @@ internal fun org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments.fi languageVersion = null useFir = false javaParameters = false - jdkHome = null jvmTarget = null moduleName = null noJdk = false diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt index 9ae151cea7f..1f269b65a3b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt @@ -103,50 +103,6 @@ internal open class KotlinJvmCompilerArgumentsContributor( } args.destinationAsFile = destinationDir - warnJdkHomeNotUsed(kotlinOptions) - kotlinOptions.forEach { it.updateArguments(args) } } - - private fun warnJdkHomeNotUsed(kotlinOptions: List) { - kotlinOptions - .firstOrNull { - @Suppress("DEPRECATION") - it.jdkHome != null - } - ?.run { - logger.warn( - """ - 'kotlinOptions.jdkHome' is deprecated and will be ignored in Kotlin 1.7! - - Consider using JavaToolchain on Gradle 6.7+: - kotlin { - jvmToolchain { - languageVersion.set(JavaLanguageVersion.of()) - } - } - - Or on older versions of Gradle: - - Kotlin DSL: - project.tasks - .withType() - .configureEach { - it.kotlinJavaToolchain.jdk.use( - "/path/to/your/jdk", - JavaVersion. - ) - } - - Groovy DSL - project.tasks - .withType(UsesKotlinJavaToolchain.class) - .configureEach { - it.kotlinJavaToolchain.jdk.use( - '/path/to/your/jdk', - JavaVersion. - ) - } - """.trimIndent() - ) - } - } }