diff --git a/build.gradle.kts b/build.gradle.kts index 554e17f9bff..7ae7b00f37e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -331,7 +331,6 @@ allprojects { val commonCompilerArgs = listOfNotNull( "-Xuse-experimental=kotlin.Experimental", - "-Xallow-kotlin-package", "-Xread-deserialized-contracts", "-Xjvm-default=compatibility", "-Xprogressive".takeIf { hasProperty("test.progressive.mode") } // TODO: change to "-progressive" after bootstrap diff --git a/libraries/kotlin.test/annotations-common/build.gradle b/libraries/kotlin.test/annotations-common/build.gradle index 11d112fb140..199288a347c 100644 --- a/libraries/kotlin.test/annotations-common/build.gradle +++ b/libraries/kotlin.test/annotations-common/build.gradle @@ -14,6 +14,10 @@ pill { importAsLibrary = true } +tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinCompile) { + kotlinOptions.freeCompilerArgs += "-Xallow-kotlin-package" +} + jar { manifestAttributes(manifest, project, 'Test') } diff --git a/libraries/kotlin.test/common/build.gradle b/libraries/kotlin.test/common/build.gradle index c046bf88ecb..0a5a3328607 100644 --- a/libraries/kotlin.test/common/build.gradle +++ b/libraries/kotlin.test/common/build.gradle @@ -31,12 +31,16 @@ artifacts { javadocJar() +tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinCompile) { + kotlinOptions.freeCompilerArgs += "-Xallow-kotlin-package" +} + compileKotlinCommon { kotlinOptions { - freeCompilerArgs = [ + freeCompilerArgs += [ "-module-name", project.name, - "-Xallow-kotlin-package", "-Xuse-experimental=kotlin.contracts.ExperimentalContracts" ] } -} \ No newline at end of file +} + diff --git a/libraries/scripting/common/build.gradle.kts b/libraries/scripting/common/build.gradle.kts index 3e3503941b4..7a2b4aa3c79 100644 --- a/libraries/scripting/common/build.gradle.kts +++ b/libraries/scripting/common/build.gradle.kts @@ -17,6 +17,10 @@ sourceSets { "test" { projectDefault() } } +tasks.withType> { + kotlinOptions.freeCompilerArgs += "-Xallow-kotlin-package" +} + publish() runtimeJar() diff --git a/libraries/scripting/intellij/build.gradle.kts b/libraries/scripting/intellij/build.gradle.kts index df178088837..e1a5a65e662 100644 --- a/libraries/scripting/intellij/build.gradle.kts +++ b/libraries/scripting/intellij/build.gradle.kts @@ -18,6 +18,10 @@ sourceSets { "test" { } } +tasks.withType> { + kotlinOptions.freeCompilerArgs += "-Xallow-kotlin-package" +} + publish() standardPublicJars() diff --git a/libraries/scripting/jsr223-test/build.gradle.kts b/libraries/scripting/jsr223-test/build.gradle.kts index d311772fdba..4e851b93f72 100644 --- a/libraries/scripting/jsr223-test/build.gradle.kts +++ b/libraries/scripting/jsr223-test/build.gradle.kts @@ -27,6 +27,10 @@ sourceSets { "test" { projectDefault() } } +tasks.withType> { + kotlinOptions.freeCompilerArgs += "-Xallow-kotlin-package" +} + projectTest(parallel = true) projectTest(taskName = "embeddableTest", parallel = true) { diff --git a/libraries/scripting/jsr223/build.gradle.kts b/libraries/scripting/jsr223/build.gradle.kts index 15515b01f39..916036ae4f4 100644 --- a/libraries/scripting/jsr223/build.gradle.kts +++ b/libraries/scripting/jsr223/build.gradle.kts @@ -26,6 +26,10 @@ sourceSets { "test" {} } +tasks.withType> { + kotlinOptions.freeCompilerArgs += "-Xallow-kotlin-package" +} + standardPublicJars() projectTest(parallel = true) diff --git a/libraries/scripting/jvm-host-test/build.gradle.kts b/libraries/scripting/jvm-host-test/build.gradle.kts index 0e138025026..dedca45bac3 100644 --- a/libraries/scripting/jvm-host-test/build.gradle.kts +++ b/libraries/scripting/jvm-host-test/build.gradle.kts @@ -37,6 +37,10 @@ sourceSets { "test" { projectDefault() } } +tasks.withType> { + kotlinOptions.freeCompilerArgs += "-Xallow-kotlin-package" +} + projectTest(parallel = true) { dependsOn(":dist") workingDir = rootDir diff --git a/libraries/scripting/jvm-host/build.gradle.kts b/libraries/scripting/jvm-host/build.gradle.kts index 97d44500d11..1003ac5aa60 100644 --- a/libraries/scripting/jvm-host/build.gradle.kts +++ b/libraries/scripting/jvm-host/build.gradle.kts @@ -28,5 +28,9 @@ sourceSets { "test" {} } +tasks.withType> { + kotlinOptions.freeCompilerArgs += "-Xallow-kotlin-package" +} + standardPublicJars() diff --git a/libraries/scripting/jvm/build.gradle.kts b/libraries/scripting/jvm/build.gradle.kts index 807f3003b22..69e883e00bf 100644 --- a/libraries/scripting/jvm/build.gradle.kts +++ b/libraries/scripting/jvm/build.gradle.kts @@ -18,6 +18,10 @@ sourceSets { "test" { projectDefault() } } +tasks.withType> { + kotlinOptions.freeCompilerArgs += "-Xallow-kotlin-package" +} + publish() runtimeJar() diff --git a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts index 16e5141699e..58a44c8730e 100644 --- a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts +++ b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts @@ -58,6 +58,7 @@ tasks.withType { freeCompilerArgs += listOf( "-module-name", "kotlin-stdlib", + "-Xallow-kotlin-package", "-Xmulti-platform", "-Xuse-experimental=kotlin.contracts.ExperimentalContracts", "-Xuse-experimental=kotlin.Experimental"