Build: do not pass JVM compiler arguments to common KotlinCompile

2020-06-30 19:41:12 +02:00
parent 8d79a6ae03
commit 9c36c74357
1 changed files with 8 additions and 4 deletions
@@ -405,9 +405,6 @@ allprojects {
    val commonCompilerArgs = listOfNotNull(
        "-Xopt-in=kotlin.RequiresOptIn",
        "-Xread-deserialized-contracts",
-        "-Xjvm-default=compatibility",
-        "-Xno-optimized-callable-references",
-        "-Xno-kotlin-nothing-value-exception",
        "-progressive".takeIf { hasProperty("test.progressive.mode") }
    )

@@ -419,9 +416,16 @@ allprojects {
        }
    }

+    val jvmCompilerArgs = listOf(
+        "-Xjvm-default=compatibility",
+        "-Xno-optimized-callable-references",
+        "-Xno-kotlin-nothing-value-exception",
+        "-Xnormalize-constructor-calls=enable"
+    )
+
    tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile> {
        kotlinOptions {
-            freeCompilerArgs = commonCompilerArgs + listOf("-Xnormalize-constructor-calls=enable")
+            freeCompilerArgs = commonCompilerArgs + jvmCompilerArgs
        }
    }