azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate -Xuse-experimental -> -Xopt-in in project sources

Browse Source
This commit is contained in:
Alexander Udalov
2020-03-05 01:34:42 +01:00
parent d668808b44
commit 787e4503e5
14 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+1 -1
View File
@@ -351,7 +351,7 @@ allprojects {
configureJvmProject(javaHome!!, jvmTarget!!) configureJvmProject(javaHome!!, jvmTarget!!)
val commonCompilerArgs = listOfNotNull( val commonCompilerArgs = listOfNotNull(
"-Xuse-experimental=kotlin.Experimental", "-Xopt-in=kotlin.RequiresOptIn",
"-Xread-deserialized-contracts", "-Xread-deserialized-contracts",
"-Xjvm-default=compatibility", "-Xjvm-default=compatibility",
"-progressive".takeIf { hasProperty("test.progressive.mode") } "-progressive".takeIf { hasProperty("test.progressive.mode") }
libraries/kotlin.test/common/build.gradle
+1 -1
View File
@@ -32,7 +32,7 @@ compileKotlinCommon {
kotlinOptions { kotlinOptions {
freeCompilerArgs += [ freeCompilerArgs += [
"-module-name", project.name, "-module-name", project.name,
"-Xuse-experimental=kotlin.contracts.ExperimentalContracts" "-Xopt-in=kotlin.contracts.ExperimentalContracts",
] ]
} }
} }
libraries/kotlin.test/js/build.gradle
+1 -1
View File
@@ -19,7 +19,7 @@ dependencies {
compileKotlin2Js { compileKotlin2Js {
kotlinOptions.freeCompilerArgs = [ kotlinOptions.freeCompilerArgs = [
"-Xallow-kotlin-package", "-Xallow-kotlin-package",
"-Xuse-experimental=kotlin.contracts.ExperimentalContracts", "-Xopt-in=kotlin.contracts.ExperimentalContracts",
] ]
kotlinOptions { kotlinOptions {
moduleKind = "umd" moduleKind = "umd"
libraries/kotlin.test/jvm/build.gradle
+1 -1
View File
@@ -49,7 +49,7 @@ javadocJar()
compileKotlin { compileKotlin {
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xnormalize-constructor-calls=enable", kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xnormalize-constructor-calls=enable",
"-Xuse-experimental=kotlin.contracts.ExperimentalContracts", "-Xopt-in=kotlin.contracts.ExperimentalContracts",
"-module-name", project.archivesBaseName, ] "-module-name", project.archivesBaseName, ]
} }
libraries/stdlib/common/build.gradle
+6 -6
View File
@@ -38,9 +38,9 @@ compileKotlinCommon {
kotlinOptions { kotlinOptions {
freeCompilerArgs = [ freeCompilerArgs = [
"-module-name", project.name, "-module-name", project.name,
"-Xuse-experimental=kotlin.Experimental", "-Xopt-in=kotlin.RequiresOptIn",
"-Xuse-experimental=kotlin.ExperimentalMultiplatform", "-Xopt-in=kotlin.ExperimentalMultiplatform",
"-Xuse-experimental=kotlin.contracts.ExperimentalContracts", "-Xopt-in=kotlin.contracts.ExperimentalContracts",
"-Xinline-classes", "-Xinline-classes",
"-Xallow-kotlin-package", "-Xallow-kotlin-package",
"-Xallow-result-return-type" "-Xallow-result-return-type"
@@ -51,9 +51,9 @@ compileKotlinCommon {
compileTestKotlinCommon { compileTestKotlinCommon {
kotlinOptions { kotlinOptions {
freeCompilerArgs += [ freeCompilerArgs += [
"-Xuse-experimental=kotlin.Experimental", "-Xopt-in=kotlin.RequiresOptIn",
"-Xuse-experimental=kotlin.ExperimentalUnsignedTypes", "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
"-Xuse-experimental=kotlin.ExperimentalStdlibApi" "-Xopt-in=kotlin.ExperimentalStdlibApi",
] ]
} }
} }
libraries/stdlib/coroutines-experimental/build.gradle.kts
+2 -2
View File
@@ -48,8 +48,8 @@ tasks {
"-Xmulti-platform", "-Xmulti-platform",
"-Xallow-kotlin-package", "-Xallow-kotlin-package",
"-Xmultifile-parts-inherit", "-Xmultifile-parts-inherit",
"-Xuse-experimental=kotlin.contracts.ExperimentalContracts", "-Xopt-in=kotlin.RequiresOptIn",
"-Xuse-experimental=kotlin.Experimental", "-Xopt-in=kotlin.contracts.ExperimentalContracts",
"-Xcoroutines=enable", "-Xcoroutines=enable",
"-XXLanguage:-ReleaseCoroutines", "-XXLanguage:-ReleaseCoroutines",
"-Xno-use-ir", "-Xno-use-ir",
libraries/stdlib/jdk7/build.gradle
+4 -4
View File
@@ -79,7 +79,7 @@ compileKotlin {
"-Xmultifile-parts-inherit", "-Xmultifile-parts-inherit",
"-Xnormalize-constructor-calls=enable", "-Xnormalize-constructor-calls=enable",
"-module-name", project.name, "-module-name", project.name,
"-Xuse-experimental=kotlin.contracts.ExperimentalContracts", "-Xopt-in=kotlin.contracts.ExperimentalContracts",
] ]
} }
@@ -87,9 +87,9 @@ compileTestKotlin {
kotlinOptions.freeCompilerArgs = [ kotlinOptions.freeCompilerArgs = [
"-Xallow-kotlin-package", "-Xallow-kotlin-package",
"-Xmulti-platform", "-Xmulti-platform",
"-Xuse-experimental=kotlin.Experimental", "-Xopt-in=kotlin.RequiresOptIn",
"-Xuse-experimental=kotlin.ExperimentalUnsignedTypes", "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
"-Xuse-experimental=kotlin.ExperimentalStdlibApi" "-Xopt-in=kotlin.ExperimentalStdlibApi",
] ]
} }
libraries/stdlib/jdk8/build.gradle
+3 -3
View File
@@ -81,9 +81,9 @@ compileTestKotlin {
kotlinOptions.freeCompilerArgs = [ kotlinOptions.freeCompilerArgs = [
"-Xallow-kotlin-package", "-Xallow-kotlin-package",
"-Xmulti-platform", "-Xmulti-platform",
"-Xuse-experimental=kotlin.Experimental", "-Xopt-in=kotlin.RequiresOptIn",
"-Xuse-experimental=kotlin.ExperimentalUnsignedTypes", "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
"-Xuse-experimental=kotlin.ExperimentalStdlibApi" "-Xopt-in=kotlin.ExperimentalStdlibApi",
] ]
} }
libraries/stdlib/js-ir/build.gradle.kts
+5 -5
View File
@@ -279,11 +279,11 @@ fun JavaExec.buildJs(sources: List<String>, dependencies: List<String>, outPath:
sources.toList() + listOf("-output", outPath) + libraryArgs + listOf( sources.toList() + listOf("-output", outPath) + libraryArgs + listOf(
"-Xir-produce-js", "-Xir-produce-js",
"-Xmulti-platform", "-Xmulti-platform",
"-Xuse-experimental=kotlin.Experimental", "-Xopt-in=kotlin.RequiresOptIn",
"-Xuse-experimental=kotlin.contracts.ExperimentalContracts", "-Xopt-in=kotlin.contracts.ExperimentalContracts",
"-Xuse-experimental=kotlin.ExperimentalMultiplatform", "-Xopt-in=kotlin.ExperimentalMultiplatform",
"-Xuse-experimental=kotlin.ExperimentalStdlibApi", "-Xopt-in=kotlin.ExperimentalStdlibApi",
"-Xuse-experimental=kotlin.ExperimentalUnsignedTypes" "-Xopt-in=kotlin.ExperimentalUnsignedTypes"
) )
args = allArgs args = allArgs
libraries/stdlib/js-v1/build.gradle
+6 -6
View File
@@ -141,9 +141,9 @@ compileKotlin2Js {
.collect { file(it).absoluteFile } .collect { file(it).absoluteFile }
) )
freeCompilerArgs += [ freeCompilerArgs += [
"-Xuse-experimental=kotlin.Experimental", "-Xopt-in=kotlin.RequiresOptIn",
"-Xuse-experimental=kotlin.ExperimentalMultiplatform", "-Xopt-in=kotlin.ExperimentalMultiplatform",
"-Xuse-experimental=kotlin.contracts.ExperimentalContracts", "-Xopt-in=kotlin.contracts.ExperimentalContracts",
"-Xinline-classes" "-Xinline-classes"
] ]
} }
@@ -153,9 +153,9 @@ compileTestKotlin2Js {
kotlinOptions { kotlinOptions {
moduleKind = "umd" moduleKind = "umd"
freeCompilerArgs += [ freeCompilerArgs += [
"-Xuse-experimental=kotlin.Experimental", "-Xopt-in=kotlin.RequiresOptIn",
"-Xuse-experimental=kotlin.ExperimentalUnsignedTypes", "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
"-Xuse-experimental=kotlin.ExperimentalStdlibApi" "-Xopt-in=kotlin.ExperimentalStdlibApi",
] ]
} }
} }
libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
+2 -2
View File
@@ -60,8 +60,8 @@ tasks.withType<KotlinCompile> {
"kotlin-stdlib", "kotlin-stdlib",
"-Xallow-kotlin-package", "-Xallow-kotlin-package",
"-Xmulti-platform", "-Xmulti-platform",
"-Xuse-experimental=kotlin.contracts.ExperimentalContracts", "-Xopt-in=kotlin.RequiresOptIn",
"-Xuse-experimental=kotlin.Experimental" "-Xopt-in=kotlin.contracts.ExperimentalContracts"
) )
} }
} }
libraries/stdlib/jvm/build.gradle
+7 -7
View File
@@ -120,9 +120,9 @@ compileKotlin {
"-Xmultifile-parts-inherit", "-Xmultifile-parts-inherit",
"-Xnormalize-constructor-calls=enable", "-Xnormalize-constructor-calls=enable",
"-module-name", "kotlin-stdlib", "-module-name", "kotlin-stdlib",
"-Xuse-experimental=kotlin.Experimental", "-Xopt-in=kotlin.RequiresOptIn",
"-Xuse-experimental=kotlin.ExperimentalMultiplatform", "-Xopt-in=kotlin.ExperimentalMultiplatform",
"-Xuse-experimental=kotlin.contracts.ExperimentalContracts", "-Xopt-in=kotlin.contracts.ExperimentalContracts",
"-Xinline-classes" "-Xinline-classes"
] ]
} }
@@ -134,15 +134,15 @@ compileJava9Sources(project, 'kotlin.stdlib', [sourceSets.main.output])
compileTestKotlin { compileTestKotlin {
kotlinOptions { kotlinOptions {
freeCompilerArgs += [ freeCompilerArgs += [
"-Xuse-experimental=kotlin.Experimental", "-Xopt-in=kotlin.RequiresOptIn",
"-Xuse-experimental=kotlin.ExperimentalUnsignedTypes", "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
"-Xuse-experimental=kotlin.ExperimentalStdlibApi" "-Xopt-in=kotlin.ExperimentalStdlibApi",
] ]
} }
} }
compileLongRunningTestKotlin { compileLongRunningTestKotlin {
kotlinOptions.freeCompilerArgs += "-Xuse-experimental=kotlin.ExperimentalStdlibApi" kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.ExperimentalStdlibApi"
} }
task longRunningTest(type: Test, dependsOn: longRunningTestClasses) { task longRunningTest(type: Test, dependsOn: longRunningTestClasses) {
libraries/stdlib/samples/build.gradle
+3 -3
View File
@@ -13,9 +13,9 @@ compileTestKotlin {
kotlinOptions { kotlinOptions {
jdkHome = JDK_18 jdkHome = JDK_18
freeCompilerArgs = [ freeCompilerArgs = [
"-Xuse-experimental=kotlin.ExperimentalStdlibApi", "-Xopt-in=kotlin.ExperimentalStdlibApi",
"-Xuse-experimental=kotlin.ExperimentalUnsignedTypes", "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
"-Xuse-experimental=kotlin.time.ExperimentalTime" "-Xopt-in=kotlin.time.ExperimentalTime",
] ]
} }
} }
libraries/tools/kotlinp/build.gradle.kts
+1 -1
View File
@@ -70,6 +70,6 @@ tasks {
tasks.withType<KotlinCompile> { tasks.withType<KotlinCompile> {
kotlinOptions { kotlinOptions {
freeCompilerArgs += listOf("-Xuse-experimental=kotlin.Experimental") freeCompilerArgs += listOf("-Xopt-in=kotlin.RequiresOptIn")
} }
} }