Apply -Xjvm-default for specific modules only

build.gradle.kts

@@ -505,7 +505,6 @@ allprojects {
     }
 
     val jvmCompilerArgs = listOf(
-        "-Xjvm-default=compatibility",
         "-Xno-optimized-callable-references",
         "-Xno-kotlin-nothing-value-exception",
         "-Xsuppress-deprecated-jvm-target-warning" // Remove as soon as there are no modules for JDK 1.6 & 1.7

buildSrc/src/main/kotlin/JvmToolchain.kt

@@ -70,10 +70,6 @@ fun Project.configureJvmToolchain(
                     options.encoding = "UTF-8"
                 }
             }
-
-        tasks.withType<KotlinCompile>().configureEach {
-            kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
-        }
     }
 }
 

compiler/frontend/build.gradle.kts

@@ -24,3 +24,7 @@ sourceSets {
     "main" { projectDefault() }
     "test" {}
 }
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
+}

compiler/testData/cli/jvm/extraHelp.out

@@ -73,8 +73,6 @@ where advanced options include:
                                                               in the interface (annotating an existing method can break binary compatibility).
                              -Xjvm-default=compatibility      Deprecated. Allow usages of @JvmDefault; generate a compatibility accessor
                                                               in the DefaultImpls class in addition to the default interface method.
-  -Xjvm-default-allow-non-default-inheritance
-                             Allow inheritance from 'all*' modes for 'disable' one
   -Xklib=<path>              Paths to cross-platform libraries in .klib format
   -Xlambdas={class|indy}     Select code generation scheme for lambdas.
                              -Xlambdas=indy                      Generate lambdas using `invokedynamic` with `LambdaMetafactory.metafactory`. Requires `-jvm-target 1.8` or greater.

libraries/scripting/intellij/build.gradle.kts

@@ -23,3 +23,7 @@ tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
 publish()
 
 standardPublicJars()
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
+}

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

@@ -79,3 +79,8 @@ projectTest {
         systemProperty("robolectric.classpath", robolectricClasspathProvider.get())
     }
 }
+
+//TODO: could be removed after bootstrap
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
+}

plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts

@@ -56,4 +56,9 @@ projectTest(parallel = true, jUnitMode = JUnitMode.JUnit5) {
     useJUnitPlatform()
 }
 
-val generateTests by generator("org.jetbrains.kotlinx.serialization.TestGeneratorKt")
+val generateTests by generator("org.jetbrains.kotlinx.serialization.TestGeneratorKt")
+
+//TODO: could be removed after bootstrap
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
+}

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

@@ -118,3 +118,8 @@ projectTest(jUnitMode = JUnitMode.JUnit5) {
         println(filter.includePatterns)
     }
 }
+
+//TODO: could be removed after bootstrap
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
+}

plugins/scripting/scripting-compiler-impl/build.gradle.kts

@@ -55,3 +55,8 @@ javadocJar()
 projectTest {
     workingDir = rootDir
 }
+
+//TODO: could be removed after bootstrap
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
+}