diff --git a/compiler/tests-common-jvm6/build.gradle.kts b/compiler/tests-common-jvm6/build.gradle.kts index 4b89e017aff..40e91a9afd9 100644 --- a/compiler/tests-common-jvm6/build.gradle.kts +++ b/compiler/tests-common-jvm6/build.gradle.kts @@ -1,4 +1,3 @@ - plugins { kotlin("jvm") id("jps-compatible") @@ -17,3 +16,9 @@ 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 e059558821a..9ecd82c2c7a 100644 --- a/core/compiler.common.jvm/build.gradle.kts +++ b/core/compiler.common.jvm/build.gradle.kts @@ -19,3 +19,9 @@ tasks.withType { sourceCompatibility = "1.6" targetCompatibility = "1.6" } + +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 6a1dc2f0d39..da0fdabab0e 100644 --- a/core/compiler.common/build.gradle.kts +++ b/core/compiler.common/build.gradle.kts @@ -21,3 +21,9 @@ tasks.withType { sourceCompatibility = "1.6" targetCompatibility = "1.6" } + +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 9a68af00ac7..bf39ff227ad 100644 --- a/core/descriptors.jvm/build.gradle.kts +++ b/core/descriptors.jvm/build.gradle.kts @@ -25,3 +25,9 @@ tasks.withType { sourceCompatibility = "1.6" targetCompatibility = "1.6" } + +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 29fb641da9c..26372c1c78b 100644 --- a/core/descriptors.runtime/build.gradle.kts +++ b/core/descriptors.runtime/build.gradle.kts @@ -29,8 +29,11 @@ val compileJava by tasks.getting(JavaCompile::class) { } val compileKotlin by tasks.getting(KotlinCompile::class) { - kotlinOptions.jvmTarget = "1.6" - kotlinOptions.jdkHome = rootProject.extra["JDK_16"] as String + kotlinOptions { + jvmTarget = "1.6" + jdkHome = rootProject.extra["JDK_16"] as String + freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" + } } val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateRuntimeDescriptorTestsKt") @@ -39,4 +42,4 @@ projectTest(parallel = true) { workingDir = rootDir } -testsJar() \ No newline at end of file +testsJar() diff --git a/core/descriptors/build.gradle.kts b/core/descriptors/build.gradle.kts index b39fa2cd85e..a9a953dc60d 100644 --- a/core/descriptors/build.gradle.kts +++ b/core/descriptors/build.gradle.kts @@ -22,3 +22,9 @@ tasks.withType { sourceCompatibility = "1.6" targetCompatibility = "1.6" } + +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 bbaf2914390..4c664eb2ffc 100644 --- a/core/deserialization.common.jvm/build.gradle.kts +++ b/core/deserialization.common.jvm/build.gradle.kts @@ -21,3 +21,9 @@ tasks.withType { sourceCompatibility = "1.6" targetCompatibility = "1.6" } + +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 0aa46054954..2ca04c99d2c 100644 --- a/core/deserialization.common/build.gradle.kts +++ b/core/deserialization.common/build.gradle.kts @@ -20,3 +20,9 @@ tasks.withType { sourceCompatibility = "1.6" targetCompatibility = "1.6" } + +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 b128c2ecb81..be02b300b26 100644 --- a/core/deserialization/build.gradle.kts +++ b/core/deserialization/build.gradle.kts @@ -23,3 +23,9 @@ tasks.withType { sourceCompatibility = "1.6" targetCompatibility = "1.6" } + +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 9b76b6bfa58..211acec8a6a 100644 --- a/core/metadata.jvm/build.gradle.kts +++ b/core/metadata.jvm/build.gradle.kts @@ -19,3 +19,9 @@ tasks.withType { sourceCompatibility = "1.6" targetCompatibility = "1.6" } + +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 b3086b20d53..b1d30dab9d2 100644 --- a/core/metadata/build.gradle.kts +++ b/core/metadata/build.gradle.kts @@ -20,3 +20,9 @@ tasks.withType { sourceCompatibility = "1.6" targetCompatibility = "1.6" } + +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 395445f6a14..8e0116b50f6 100644 --- a/core/util.runtime/build.gradle.kts +++ b/core/util.runtime/build.gradle.kts @@ -1,6 +1,4 @@ - plugins { - java kotlin("jvm") id("jps-compatible") } @@ -21,3 +19,9 @@ tasks.withType { sourceCompatibility = "1.6" targetCompatibility = "1.6" } + +tasks.withType().configureEach { + kotlinOptions { + freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" + } +} diff --git a/libraries/commonConfiguration.gradle b/libraries/commonConfiguration.gradle index 84a4940fc52..a5af870d911 100644 --- a/libraries/commonConfiguration.gradle +++ b/libraries/commonConfiguration.gradle @@ -42,6 +42,7 @@ ext.configureJvm6Project = { Project project -> if (!tasksWithWarnings.contains(task.path)) { task.kotlinOptions { allWarningsAsErrors = true + freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" } } } diff --git a/libraries/kotlin.test/junit/build.gradle b/libraries/kotlin.test/junit/build.gradle index 809436c2aac..1fb0dc85c6e 100644 --- a/libraries/kotlin.test/junit/build.gradle +++ b/libraries/kotlin.test/junit/build.gradle @@ -30,12 +30,18 @@ configureSourcesJar() configureJavadocJar() compileKotlin { - kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"] + kotlinOptions.freeCompilerArgs = [ + "-Xallow-kotlin-package", + "-Xsuppress-deprecated-jvm-target-warning", + ] kotlinOptions.moduleName = project.name } compileTestKotlin { - kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"] + kotlinOptions.freeCompilerArgs = [ + "-Xallow-kotlin-package", + "-Xsuppress-deprecated-jvm-target-warning", + ] } configureJvmIrBackend(project) diff --git a/libraries/kotlin.test/junit5/build.gradle b/libraries/kotlin.test/junit5/build.gradle index 411b48e69fc..48d180522c4 100644 --- a/libraries/kotlin.test/junit5/build.gradle +++ b/libraries/kotlin.test/junit5/build.gradle @@ -40,12 +40,18 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { } compileKotlin { - kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"] + kotlinOptions.freeCompilerArgs = [ + "-Xallow-kotlin-package", + "-Xsuppress-deprecated-jvm-target-warning", + ] kotlinOptions.moduleName = project.name } compileTestKotlin { - kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"] + kotlinOptions.freeCompilerArgs = [ + "-Xallow-kotlin-package", + "-Xsuppress-deprecated-jvm-target-warning", + ] } configureJvmIrBackend(project) diff --git a/libraries/kotlin.test/jvm/build.gradle b/libraries/kotlin.test/jvm/build.gradle index 5dd30c3d69e..64dc8941f1f 100644 --- a/libraries/kotlin.test/jvm/build.gradle +++ b/libraries/kotlin.test/jvm/build.gradle @@ -41,13 +41,20 @@ configureSourcesJar() configureJavadocJar() compileKotlin { - kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xnormalize-constructor-calls=enable", - "-Xopt-in=kotlin.contracts.ExperimentalContracts"] + kotlinOptions.freeCompilerArgs = [ + "-Xallow-kotlin-package", + "-Xnormalize-constructor-calls=enable", + "-Xopt-in=kotlin.contracts.ExperimentalContracts", + "-Xsuppress-deprecated-jvm-target-warning", + ] kotlinOptions.moduleName = project.archivesBaseName } compileTestKotlin { - kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"] + kotlinOptions.freeCompilerArgs = [ + "-Xallow-kotlin-package", + "-Xsuppress-deprecated-jvm-target-warning", + ] } configureJvmIrBackend(project) diff --git a/libraries/kotlin.test/testng/build.gradle b/libraries/kotlin.test/testng/build.gradle index 4f54d75a130..dd96564e7d0 100644 --- a/libraries/kotlin.test/testng/build.gradle +++ b/libraries/kotlin.test/testng/build.gradle @@ -33,12 +33,18 @@ configureSourcesJar() configureJavadocJar() compileKotlin { - kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"] + kotlinOptions.freeCompilerArgs = [ + "-Xallow-kotlin-package", + "-Xsuppress-deprecated-jvm-target-warning", + ] kotlinOptions.moduleName = project.name } compileTestKotlin { - kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"] + kotlinOptions.freeCompilerArgs = [ + "-Xallow-kotlin-package", + "-Xsuppress-deprecated-jvm-target-warning", + ] } configureJvmIrBackend(project) diff --git a/libraries/reflect/api/build.gradle b/libraries/reflect/api/build.gradle index c9526386db7..37b3d1dfd86 100644 --- a/libraries/reflect/api/build.gradle +++ b/libraries/reflect/api/build.gradle @@ -47,6 +47,7 @@ compileKotlin { "-Xnormalize-constructor-calls=enable", "-Xno-optimized-callable-references", "-Xno-kotlin-nothing-value-exception", + "-Xsuppress-deprecated-jvm-target-warning", "-Xopt-in=kotlin.RequiresOptIn"] moduleName = "kotlin-reflection" } diff --git a/libraries/scripting/jvm/build.gradle.kts b/libraries/scripting/jvm/build.gradle.kts index 1c4d0375587..2da19f7fcd0 100644 --- a/libraries/scripting/jvm/build.gradle.kts +++ b/libraries/scripting/jvm/build.gradle.kts @@ -1,4 +1,3 @@ - plugins { kotlin("jvm") id("jps-compatible") @@ -21,7 +20,10 @@ sourceSets { } tasks.withType> { - kotlinOptions.freeCompilerArgs += "-Xallow-kotlin-package" + kotlinOptions.freeCompilerArgs += listOf( + "-Xallow-kotlin-package", + "-Xsuppress-deprecated-jvm-target-warning" + ) } tasks.withType { diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle index 9828cfd9148..a7774d0ed55 100644 --- a/libraries/stdlib/jdk7/build.gradle +++ b/libraries/stdlib/jdk7/build.gradle @@ -77,6 +77,7 @@ compileKotlin { "-Xnormalize-constructor-calls=enable", "-Xopt-in=kotlin.RequiresOptIn", "-Xopt-in=kotlin.contracts.ExperimentalContracts", + "-Xsuppress-deprecated-jvm-target-warning", ] kotlinOptions.moduleName = project.name } @@ -90,6 +91,7 @@ compileTestKotlin { "-Xopt-in=kotlin.ExperimentalStdlibApi", "-Xopt-in=kotlin.io.path.ExperimentalPathApi", "-Xcommon-sources=${fileTree('../test').join(',')}", + "-Xsuppress-deprecated-jvm-target-warning", ] } diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle index ac563951128..9a48d3bf301 100644 --- a/libraries/stdlib/jvm/build.gradle +++ b/libraries/stdlib/jvm/build.gradle @@ -120,7 +120,8 @@ compileKotlin { "-Xopt-in=kotlin.ExperimentalMultiplatform", "-Xopt-in=kotlin.contracts.ExperimentalContracts", "-Xinline-classes", - "-Xuse-14-inline-classes-mangling-scheme" + "-Xuse-14-inline-classes-mangling-scheme", + "-Xsuppress-deprecated-jvm-target-warning", ] moduleName = "kotlin-stdlib" } diff --git a/libraries/tools/script-runtime/build.gradle b/libraries/tools/script-runtime/build.gradle index 6f9c169593d..d2989069696 100644 --- a/libraries/tools/script-runtime/build.gradle +++ b/libraries/tools/script-runtime/build.gradle @@ -34,8 +34,9 @@ configureJavadocJar() compileKotlin { kotlinOptions.freeCompilerArgs = [ - "-Xallow-kotlin-package", - "-Xnormalize-constructor-calls=enable", + "-Xallow-kotlin-package", + "-Xnormalize-constructor-calls=enable", + "-Xsuppress-deprecated-jvm-target-warning", ] kotlinOptions.moduleName = project.name } diff --git a/plugins/android-extensions/android-extensions-runtime/build.gradle.kts b/plugins/android-extensions/android-extensions-runtime/build.gradle.kts index 848ee98aa31..3e144b350d1 100644 --- a/plugins/android-extensions/android-extensions-runtime/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-runtime/build.gradle.kts @@ -22,3 +22,9 @@ 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 b720973b74b..6ee8ab12434 100644 --- a/plugins/kapt3/kapt3-runtime/build.gradle.kts +++ b/plugins/kapt3/kapt3-runtime/build.gradle.kts @@ -21,3 +21,9 @@ 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 ce059b633c3..ac00368bef9 100644 --- a/plugins/parcelize/parcelize-runtime/build.gradle.kts +++ b/plugins/parcelize/parcelize-runtime/build.gradle.kts @@ -24,4 +24,10 @@ publish { runtimeJar() sourcesJar() -javadocJar() \ No newline at end of file +javadocJar() + +tasks.withType().configureEach { + kotlinOptions { + freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" + } +}