From 0a9498f7e20a25474dfb53490a3fa9725fa376c3 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sun, 25 Jul 2021 21:32:34 +0200 Subject: [PATCH] Build: suppress deprecated JVM target warning globally There seems to be no point in configuring the compiler argument per project. This argument will be deleted soon anyway, when we remove support for JDK 1.6 & 1.7. Also remove `disableDeprecatedJvmTargetWarning`. It didn't have any effect in all modules where it was applied because these modules reassign `freeCompilerArgs` anyway, with `-Xsuppress-deprecated-jvm-target-warning` in it. --- build.gradle.kts | 3 ++- buildSrc/src/main/kotlin/LibrariesCommon.kt | 18 ------------------ compiler/tests-common-jvm6/build.gradle.kts | 6 ------ core/compiler.common.jvm/build.gradle.kts | 6 ------ core/compiler.common/build.gradle.kts | 6 ------ core/descriptors.jvm/build.gradle.kts | 6 ------ core/descriptors.runtime/build.gradle.kts | 2 -- core/descriptors/build.gradle.kts | 6 ------ .../build.gradle.kts | 6 ------ core/deserialization.common/build.gradle.kts | 6 ------ core/deserialization/build.gradle.kts | 6 ------ core/metadata.jvm/build.gradle.kts | 6 ------ core/metadata/build.gradle.kts | 6 ------ core/util.runtime/build.gradle.kts | 6 ------ libraries/kotlin.test/junit/build.gradle | 1 - libraries/kotlin.test/junit5/build.gradle | 2 -- libraries/kotlin.test/jvm/build.gradle | 1 - libraries/kotlin.test/testng/build.gradle | 1 - libraries/kotlinx-metadata/build.gradle.kts | 6 ------ .../kotlinx-metadata/jvm/build.gradle.kts | 6 ------ libraries/reflect/api/build.gradle | 1 - libraries/scripting/common/build.gradle.kts | 2 +- .../dependencies-maven/build.gradle.kts | 2 +- .../scripting/dependencies/build.gradle.kts | 2 +- libraries/scripting/jvm/build.gradle.kts | 3 +-- libraries/stdlib/jdk7/build.gradle | 1 - .../jvm-minimal-for-test/build.gradle.kts | 1 - libraries/stdlib/jvm/build.gradle | 1 - .../tools/kotlin-annotations-jvm/build.gradle | 1 - libraries/tools/script-runtime/build.gradle | 1 - .../build.gradle.kts | 6 ------ plugins/kapt3/kapt3-runtime/build.gradle.kts | 6 ------ .../parcelize-runtime/build.gradle.kts | 6 ------ 33 files changed, 6 insertions(+), 133 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 587b63f711f..4d134cbb3a5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -459,7 +459,8 @@ allprojects { val jvmCompilerArgs = listOf( "-Xjvm-default=compatibility", "-Xno-optimized-callable-references", - "-Xno-kotlin-nothing-value-exception" + "-Xno-kotlin-nothing-value-exception", + "-Xsuppress-deprecated-jvm-target-warning" // Remove as soon as there are no modules for JDK 1.6 & 1.7 ) tasks.withType { diff --git a/buildSrc/src/main/kotlin/LibrariesCommon.kt b/buildSrc/src/main/kotlin/LibrariesCommon.kt index c8bdbfe7491..d3a97c61b5f 100644 --- a/buildSrc/src/main/kotlin/LibrariesCommon.kt +++ b/buildSrc/src/main/kotlin/LibrariesCommon.kt @@ -9,12 +9,8 @@ import org.gradle.api.JavaVersion import org.gradle.api.Project import org.gradle.api.file.FileCollection import org.gradle.api.tasks.compile.JavaCompile -import org.gradle.kotlin.dsl.extra import org.gradle.kotlin.dsl.get -import org.gradle.kotlin.dsl.provideDelegate -import org.gradle.kotlin.dsl.withType import org.gradle.process.CommandLineArgumentProvider -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @JvmOverloads fun Project.configureJava9Compilation( @@ -59,17 +55,3 @@ private class Java9AdditionalArgumentsProvider( "-Xlint:-requires-transitive-automatic" // suppress automatic module transitive dependencies in kotlin.test ) } - -fun Project.disableDeprecatedJvmTargetWarning() { - if (!kotlinBuildProperties.disableWerror) { - val tasksWithWarnings: List by rootProject.extra - tasks.withType().configureEach { - if (!tasksWithWarnings.contains(path)) { - kotlinOptions { - allWarningsAsErrors = true - freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" - } - } - } - } -} diff --git a/compiler/tests-common-jvm6/build.gradle.kts b/compiler/tests-common-jvm6/build.gradle.kts index a003988f168..6e9c9b53d1f 100644 --- a/compiler/tests-common-jvm6/build.gradle.kts +++ b/compiler/tests-common-jvm6/build.gradle.kts @@ -16,9 +16,3 @@ sourceSets { } testsJar {} - -tasks.withType().configureEach { - kotlinOptions { - freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" - } -} diff --git a/core/compiler.common.jvm/build.gradle.kts b/core/compiler.common.jvm/build.gradle.kts index 0457df91b5b..a87c74b4449 100644 --- a/core/compiler.common.jvm/build.gradle.kts +++ b/core/compiler.common.jvm/build.gradle.kts @@ -13,9 +13,3 @@ sourceSets { "main" { projectDefault() } "test" {} } - -tasks.withType().configureEach { - kotlinOptions { - freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" - } -} diff --git a/core/compiler.common/build.gradle.kts b/core/compiler.common/build.gradle.kts index 2655c6e7c86..088de63dc8f 100644 --- a/core/compiler.common/build.gradle.kts +++ b/core/compiler.common/build.gradle.kts @@ -15,9 +15,3 @@ sourceSets { "main" { projectDefault() } "test" {} } - -tasks.withType().configureEach { - kotlinOptions { - freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" - } -} diff --git a/core/descriptors.jvm/build.gradle.kts b/core/descriptors.jvm/build.gradle.kts index e5e9ea03f31..f8b51325124 100644 --- a/core/descriptors.jvm/build.gradle.kts +++ b/core/descriptors.jvm/build.gradle.kts @@ -19,9 +19,3 @@ sourceSets { "main" { projectDefault() } "test" {} } - -tasks.withType().configureEach { - kotlinOptions { - freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" - } -} diff --git a/core/descriptors.runtime/build.gradle.kts b/core/descriptors.runtime/build.gradle.kts index 0bb27c2b51c..0cd97dbf8c5 100644 --- a/core/descriptors.runtime/build.gradle.kts +++ b/core/descriptors.runtime/build.gradle.kts @@ -5,8 +5,6 @@ plugins { id("jps-compatible") } -// Only compilation tasks should use JDK 1.6 -project.disableDeprecatedJvmTargetWarning() tasks .matching { it.name == "compileKotlin" && it is KotlinCompile } .configureEach { diff --git a/core/descriptors/build.gradle.kts b/core/descriptors/build.gradle.kts index 1c707e59684..52a0c6c5eb5 100644 --- a/core/descriptors/build.gradle.kts +++ b/core/descriptors/build.gradle.kts @@ -16,9 +16,3 @@ sourceSets { "main" { projectDefault() } "test" {} } - -tasks.withType().configureEach { - kotlinOptions { - freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" - } -} diff --git a/core/deserialization.common.jvm/build.gradle.kts b/core/deserialization.common.jvm/build.gradle.kts index 71418e3ffc3..70bfe2d567b 100644 --- a/core/deserialization.common.jvm/build.gradle.kts +++ b/core/deserialization.common.jvm/build.gradle.kts @@ -15,9 +15,3 @@ sourceSets { "main" { projectDefault() } "test" {} } - -tasks.withType().configureEach { - kotlinOptions { - freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" - } -} diff --git a/core/deserialization.common/build.gradle.kts b/core/deserialization.common/build.gradle.kts index 0f1e8038e40..ccbc08528a1 100644 --- a/core/deserialization.common/build.gradle.kts +++ b/core/deserialization.common/build.gradle.kts @@ -14,9 +14,3 @@ sourceSets { "main" { projectDefault() } "test" {} } - -tasks.withType().configureEach { - kotlinOptions { - freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" - } -} diff --git a/core/deserialization/build.gradle.kts b/core/deserialization/build.gradle.kts index 36042bac08a..6b97641e306 100644 --- a/core/deserialization/build.gradle.kts +++ b/core/deserialization/build.gradle.kts @@ -17,9 +17,3 @@ sourceSets { "main" { projectDefault() } "test" {} } - -tasks.withType().configureEach { - kotlinOptions { - freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" - } -} diff --git a/core/metadata.jvm/build.gradle.kts b/core/metadata.jvm/build.gradle.kts index e8fd594ccf8..42d6971504c 100644 --- a/core/metadata.jvm/build.gradle.kts +++ b/core/metadata.jvm/build.gradle.kts @@ -13,9 +13,3 @@ sourceSets { "main" { projectDefault() } "test" {} } - -tasks.withType().configureEach { - kotlinOptions { - freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" - } -} diff --git a/core/metadata/build.gradle.kts b/core/metadata/build.gradle.kts index 4d261bf3f93..bb8c1e41499 100644 --- a/core/metadata/build.gradle.kts +++ b/core/metadata/build.gradle.kts @@ -14,9 +14,3 @@ sourceSets { "main" { projectDefault() } "test" {} } - -tasks.withType().configureEach { - kotlinOptions { - freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" - } -} diff --git a/core/util.runtime/build.gradle.kts b/core/util.runtime/build.gradle.kts index e80b0d25d9b..6f234688663 100644 --- a/core/util.runtime/build.gradle.kts +++ b/core/util.runtime/build.gradle.kts @@ -13,9 +13,3 @@ sourceSets { "main" { projectDefault() } "test" {} } - -tasks.withType().configureEach { - kotlinOptions { - freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" - } -} diff --git a/libraries/kotlin.test/junit/build.gradle b/libraries/kotlin.test/junit/build.gradle index 81d834109fe..dc5d04b6304 100644 --- a/libraries/kotlin.test/junit/build.gradle +++ b/libraries/kotlin.test/junit/build.gradle @@ -3,7 +3,6 @@ description = 'Kotlin Test JUnit' apply plugin: 'kotlin-platform-jvm' JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_6) -LibrariesCommon.disableDeprecatedJvmTargetWarning(project) def includeJava9 = BuildPropertiesExtKt.getIncludeJava9(project.kotlinBuildProperties) diff --git a/libraries/kotlin.test/junit5/build.gradle b/libraries/kotlin.test/junit5/build.gradle index 4d0a35c4757..cdc53a7c2a1 100644 --- a/libraries/kotlin.test/junit5/build.gradle +++ b/libraries/kotlin.test/junit5/build.gradle @@ -33,7 +33,6 @@ configureJavadocJar() compileKotlin { kotlinOptions.freeCompilerArgs = [ "-Xallow-kotlin-package", - "-Xsuppress-deprecated-jvm-target-warning", ] kotlinOptions.moduleName = project.name } @@ -41,7 +40,6 @@ compileKotlin { compileTestKotlin { kotlinOptions.freeCompilerArgs = [ "-Xallow-kotlin-package", - "-Xsuppress-deprecated-jvm-target-warning", ] } diff --git a/libraries/kotlin.test/jvm/build.gradle b/libraries/kotlin.test/jvm/build.gradle index 17647a83a64..9cc61e0ee04 100644 --- a/libraries/kotlin.test/jvm/build.gradle +++ b/libraries/kotlin.test/jvm/build.gradle @@ -5,7 +5,6 @@ apply plugin: 'kotlin-platform-jvm' archivesBaseName = 'kotlin-test' JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_6) -LibrariesCommon.disableDeprecatedJvmTargetWarning(project) def includeJava9 = BuildPropertiesExtKt.getIncludeJava9(project.kotlinBuildProperties) diff --git a/libraries/kotlin.test/testng/build.gradle b/libraries/kotlin.test/testng/build.gradle index a19d5a233f0..ec1da9d9a24 100644 --- a/libraries/kotlin.test/testng/build.gradle +++ b/libraries/kotlin.test/testng/build.gradle @@ -4,7 +4,6 @@ apply plugin: 'kotlin-platform-jvm' JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_7) JvmToolchain.updateJvmTarget(project, "1.6") -LibrariesCommon.disableDeprecatedJvmTargetWarning(project) def includeJava9 = BuildPropertiesExtKt.getIncludeJava9(project.kotlinBuildProperties) diff --git a/libraries/kotlinx-metadata/build.gradle.kts b/libraries/kotlinx-metadata/build.gradle.kts index 3867f1ceb7c..c837eabaeae 100644 --- a/libraries/kotlinx-metadata/build.gradle.kts +++ b/libraries/kotlinx-metadata/build.gradle.kts @@ -23,9 +23,3 @@ dependencies { compileOnly(project(":core:metadata")) compileOnly(protobufLite()) } - -tasks.withType> { - kotlinOptions { - freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" - } -} diff --git a/libraries/kotlinx-metadata/jvm/build.gradle.kts b/libraries/kotlinx-metadata/jvm/build.gradle.kts index c486c992f62..7454afcf514 100644 --- a/libraries/kotlinx-metadata/jvm/build.gradle.kts +++ b/libraries/kotlinx-metadata/jvm/build.gradle.kts @@ -52,12 +52,6 @@ dependencies { testRuntimeOnly(project(":kotlin-reflect")) } -tasks.withType> { - kotlinOptions { - freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" - } -} - if (deployVersion != null) { publish() } diff --git a/libraries/reflect/api/build.gradle b/libraries/reflect/api/build.gradle index 803ddb846d5..495c3f7bd31 100644 --- a/libraries/reflect/api/build.gradle +++ b/libraries/reflect/api/build.gradle @@ -3,7 +3,6 @@ description = '' apply plugin: 'kotlin' JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_6) -LibrariesCommon.disableDeprecatedJvmTargetWarning(project) def includeJava9 = BuildPropertiesExtKt.getIncludeJava9(project.kotlinBuildProperties) diff --git a/libraries/scripting/common/build.gradle.kts b/libraries/scripting/common/build.gradle.kts index 187287cde4b..483a75ce00b 100644 --- a/libraries/scripting/common/build.gradle.kts +++ b/libraries/scripting/common/build.gradle.kts @@ -18,7 +18,7 @@ sourceSets { tasks.withType> { kotlinOptions.freeCompilerArgs += listOf( - "-Xallow-kotlin-package", "-Xsuppress-deprecated-jvm-target-warning" + "-Xallow-kotlin-package" ) } diff --git a/libraries/scripting/dependencies-maven/build.gradle.kts b/libraries/scripting/dependencies-maven/build.gradle.kts index 6e17ae1661c..9b401d2acd6 100644 --- a/libraries/scripting/dependencies-maven/build.gradle.kts +++ b/libraries/scripting/dependencies-maven/build.gradle.kts @@ -43,7 +43,7 @@ sourceSets { tasks.withType> { kotlinOptions.freeCompilerArgs += listOf( - "-Xallow-kotlin-package", "-Xsuppress-deprecated-jvm-target-warning" + "-Xallow-kotlin-package" ) } diff --git a/libraries/scripting/dependencies/build.gradle.kts b/libraries/scripting/dependencies/build.gradle.kts index 29b7e2ad728..a91a2b729e1 100644 --- a/libraries/scripting/dependencies/build.gradle.kts +++ b/libraries/scripting/dependencies/build.gradle.kts @@ -19,7 +19,7 @@ sourceSets { tasks.withType> { kotlinOptions.freeCompilerArgs += listOf( - "-Xallow-kotlin-package", "-Xsuppress-deprecated-jvm-target-warning" + "-Xallow-kotlin-package" ) } diff --git a/libraries/scripting/jvm/build.gradle.kts b/libraries/scripting/jvm/build.gradle.kts index 540ce40708e..0446ab6c547 100644 --- a/libraries/scripting/jvm/build.gradle.kts +++ b/libraries/scripting/jvm/build.gradle.kts @@ -19,8 +19,7 @@ sourceSets { tasks.withType> { kotlinOptions.freeCompilerArgs += listOf( - "-Xallow-kotlin-package", - "-Xsuppress-deprecated-jvm-target-warning" + "-Xallow-kotlin-package" ) } diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle index 2a2a98c0d1f..3c865f0dd66 100644 --- a/libraries/stdlib/jdk7/build.gradle +++ b/libraries/stdlib/jdk7/build.gradle @@ -4,7 +4,6 @@ apply plugin: 'kotlin' JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_7) JvmToolchain.updateJvmTarget(project, "1.6") -LibrariesCommon.disableDeprecatedJvmTargetWarning(project) configurePublishing(project) configureSourcesJar() diff --git a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts index 304216229c0..0295b380c0a 100644 --- a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts +++ b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts @@ -59,7 +59,6 @@ tasks.withType { freeCompilerArgs += listOf( "-Xallow-kotlin-package", "-Xmulti-platform", - "-Xsuppress-deprecated-jvm-target-warning", "-Xopt-in=kotlin.RequiresOptIn", "-Xopt-in=kotlin.contracts.ExperimentalContracts" ) diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle index df5fb543d1b..a2ee2b44947 100644 --- a/libraries/stdlib/jvm/build.gradle +++ b/libraries/stdlib/jvm/build.gradle @@ -5,7 +5,6 @@ apply plugin: 'kotlin-platform-jvm' archivesBaseName = 'kotlin-stdlib' JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_6) -LibrariesCommon.disableDeprecatedJvmTargetWarning(project) configurePublishing(project) configureJavadocJar() diff --git a/libraries/tools/kotlin-annotations-jvm/build.gradle b/libraries/tools/kotlin-annotations-jvm/build.gradle index 1b25202b33f..28c98b39240 100644 --- a/libraries/tools/kotlin-annotations-jvm/build.gradle +++ b/libraries/tools/kotlin-annotations-jvm/build.gradle @@ -3,7 +3,6 @@ description = 'Kotlin annotations for JVM' apply plugin: 'kotlin' JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_6) -LibrariesCommon.disableDeprecatedJvmTargetWarning(project) configurePublishing(project) diff --git a/libraries/tools/script-runtime/build.gradle b/libraries/tools/script-runtime/build.gradle index 639fedbd5ab..67db396f446 100644 --- a/libraries/tools/script-runtime/build.gradle +++ b/libraries/tools/script-runtime/build.gradle @@ -3,7 +3,6 @@ description 'Kotlin Script Runtime' apply plugin: 'kotlin' JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_6) -LibrariesCommon.disableDeprecatedJvmTargetWarning(project) configurePublishing(project) diff --git a/plugins/android-extensions/android-extensions-runtime/build.gradle.kts b/plugins/android-extensions/android-extensions-runtime/build.gradle.kts index 420eda91837..bdbd325a1b7 100644 --- a/plugins/android-extensions/android-extensions-runtime/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-runtime/build.gradle.kts @@ -22,9 +22,3 @@ publish() runtimeJar() sourcesJar() javadocJar() - -tasks.withType().configureEach { - kotlinOptions { - freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" - } -} diff --git a/plugins/kapt3/kapt3-runtime/build.gradle.kts b/plugins/kapt3/kapt3-runtime/build.gradle.kts index 65470b4fbb8..f5b1bc83335 100644 --- a/plugins/kapt3/kapt3-runtime/build.gradle.kts +++ b/plugins/kapt3/kapt3-runtime/build.gradle.kts @@ -21,9 +21,3 @@ publish() runtimeJar() sourcesJar() javadocJar() - -tasks.withType().configureEach { - kotlinOptions { - freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" - } -} diff --git a/plugins/parcelize/parcelize-runtime/build.gradle.kts b/plugins/parcelize/parcelize-runtime/build.gradle.kts index eddc393d217..0ee2666400c 100644 --- a/plugins/parcelize/parcelize-runtime/build.gradle.kts +++ b/plugins/parcelize/parcelize-runtime/build.gradle.kts @@ -25,9 +25,3 @@ publish { runtimeJar() sourcesJar() javadocJar() - -tasks.withType().configureEach { - kotlinOptions { - freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" - } -}