Add -Xsuppress-deprecated-jvm-target-warning to modules compiled with 1.6

Currently this leads to an unknown argument warning, but it'll be
removed automatically on the next bootstrap.

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<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning"
+    }
+}

core/compiler.common.jvm/build.gradle.kts

@@ -19,3 +19,9 @@ tasks.withType<JavaCompile> {
     sourceCompatibility = "1.6"
     targetCompatibility = "1.6"
 }
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning"
+    }
+}

core/compiler.common/build.gradle.kts

@@ -21,3 +21,9 @@ tasks.withType<JavaCompile> {
     sourceCompatibility = "1.6"
     targetCompatibility = "1.6"
 }
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning"
+    }
+}

core/descriptors.jvm/build.gradle.kts

@@ -25,3 +25,9 @@ tasks.withType<JavaCompile> {
     sourceCompatibility = "1.6"
     targetCompatibility = "1.6"
 }
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning"
+    }
+}

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 {
-    kotlinOptions.jdkHome = rootProject.extra["JDK_16"] as String
+        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()
+testsJar()

core/descriptors/build.gradle.kts

@@ -22,3 +22,9 @@ tasks.withType<JavaCompile> {
     sourceCompatibility = "1.6"
     targetCompatibility = "1.6"
 }
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning"
+    }
+}

core/deserialization.common.jvm/build.gradle.kts

@@ -21,3 +21,9 @@ tasks.withType<JavaCompile> {
     sourceCompatibility = "1.6"
     targetCompatibility = "1.6"
 }
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning"
+    }
+}

core/deserialization.common/build.gradle.kts

@@ -20,3 +20,9 @@ tasks.withType<JavaCompile> {
     sourceCompatibility = "1.6"
     targetCompatibility = "1.6"
 }
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning"
+    }
+}

core/deserialization/build.gradle.kts

@@ -23,3 +23,9 @@ tasks.withType<JavaCompile> {
     sourceCompatibility = "1.6"
     targetCompatibility = "1.6"
 }
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning"
+    }
+}

core/metadata.jvm/build.gradle.kts

@@ -19,3 +19,9 @@ tasks.withType<JavaCompile> {
     sourceCompatibility = "1.6"
     targetCompatibility = "1.6"
 }
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning"
+    }
+}

core/metadata/build.gradle.kts

@@ -20,3 +20,9 @@ tasks.withType<JavaCompile> {
     sourceCompatibility = "1.6"
     targetCompatibility = "1.6"
 }
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning"
+    }
+}

core/util.runtime/build.gradle.kts

@@ -1,6 +1,4 @@
-
 plugins {
-    java
     kotlin("jvm")
     id("jps-compatible")
 }
@@ -21,3 +19,9 @@ tasks.withType<JavaCompile> {
     sourceCompatibility = "1.6"
     targetCompatibility = "1.6"
 }
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning"
+    }
+}

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"
                 }
             }
         }

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)

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)

libraries/kotlin.test/jvm/build.gradle

@@ -41,13 +41,20 @@ configureSourcesJar()
 configureJavadocJar()
 
 compileKotlin {
-    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xnormalize-constructor-calls=enable",
+    kotlinOptions.freeCompilerArgs = [
-                                      "-Xopt-in=kotlin.contracts.ExperimentalContracts"]
+        "-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)

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)

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"
     }

libraries/scripting/jvm/build.gradle.kts

@@ -1,4 +1,3 @@
-
 plugins {
     kotlin("jvm")
     id("jps-compatible")
@@ -21,7 +20,10 @@ sourceSets {
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
-    kotlinOptions.freeCompilerArgs += "-Xallow-kotlin-package"
+    kotlinOptions.freeCompilerArgs += listOf(
+        "-Xallow-kotlin-package",
+        "-Xsuppress-deprecated-jvm-target-warning"
+    )
 }
 
 tasks.withType<Test> {

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",
     ]
 }
 

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"
     }

libraries/tools/script-runtime/build.gradle

@@ -34,8 +34,9 @@ configureJavadocJar()
 
 compileKotlin {
     kotlinOptions.freeCompilerArgs = [
-            "-Xallow-kotlin-package",
+        "-Xallow-kotlin-package",
-            "-Xnormalize-constructor-calls=enable",
+        "-Xnormalize-constructor-calls=enable",
+        "-Xsuppress-deprecated-jvm-target-warning",
     ]
     kotlinOptions.moduleName = project.name
 }

plugins/android-extensions/android-extensions-runtime/build.gradle.kts

@@ -22,3 +22,9 @@ publish()
 runtimeJar()
 sourcesJar()
 javadocJar()
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning"
+    }
+}

plugins/kapt3/kapt3-runtime/build.gradle.kts

@@ -21,3 +21,9 @@ publish()
 runtimeJar()
 sourcesJar()
 javadocJar()
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning"
+    }
+}

plugins/parcelize/parcelize-runtime/build.gradle.kts

@@ -24,4 +24,10 @@ publish {
 
 runtimeJar()
 sourcesJar()
-javadocJar()
+javadocJar()
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning"
+    }
+}