From ed035d99ab654102fa0735fea00043ab6f63997a Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 2 Sep 2021 12:50:31 +0300 Subject: [PATCH] Migrate -Xopt-in to -opt-in in Gradle Kotlin scripts --- build.gradle.kts | 2 +- buildSrc/build.gradle.kts | 4 ++-- compiler/daemon/build.gradle.kts | 2 +- compiler/daemon/daemon-client-new/build.gradle.kts | 2 +- compiler/daemon/daemon-common-new/build.gradle.kts | 2 +- compiler/fir/build.gradle.kts | 2 +- compiler/fir/fir2ir/build.gradle.kts | 2 +- compiler/ir/ir.psi2ir/build.gradle.kts | 2 +- compiler/ir/serialization.common/build.gradle.kts | 2 +- compiler/visualizer/render-fir/build.gradle.kts | 2 +- idea/idea-frontend-fir/build.gradle.kts | 2 +- kotlin-native/Interop/Runtime/build.gradle.kts | 4 ++-- kotlin-native/performance/buildSrc/build.gradle.kts | 4 ++-- .../tools/benchmarksAnalyzer/buildSrc/build.gradle.kts | 4 ++-- .../tools/performance-server/buildSrc/build.gradle.kts | 4 ++-- .../performance-server/ui/buildSrc/build.gradle.kts | 4 ++-- libraries/kotlin.test/js-ir/build.gradle.kts | 4 ++-- .../stdlib/js-ir-minimal-for-test/build.gradle.kts | 10 +++++----- libraries/stdlib/js-ir/build.gradle.kts | 10 +++++----- libraries/stdlib/jvm-minimal-for-test/build.gradle.kts | 4 ++-- libraries/stdlib/wasm/build.gradle.kts | 10 +++++----- libraries/tools/kotlinp/build.gradle.kts | 2 +- .../kotlin-serialization-compiler/build.gradle.kts | 2 +- wasm/wasm.ir/build.gradle.kts | 2 +- 24 files changed, 44 insertions(+), 44 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 87fe9793808..cb3566cca29 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -444,7 +444,7 @@ allprojects { } val commonCompilerArgs = listOfNotNull( - "-Xopt-in=kotlin.RequiresOptIn", + "-opt-in=kotlin.RequiresOptIn", "-progressive".takeIf { hasProperty("test.progressive.mode") } ) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 3cf5de2b1ef..df045ad653f 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -197,10 +197,10 @@ java { tasks.withType().configureEach { kotlinOptions.allWarningsAsErrors = true kotlinOptions.freeCompilerArgs += listOf( - "-Xopt-in=kotlin.RequiresOptIn", + "-opt-in=kotlin.RequiresOptIn", "-Xskip-runtime-version-check", "-Xsuppress-version-warnings", - "-Xopt-in=kotlin.ExperimentalStdlibApi" + "-opt-in=kotlin.ExperimentalStdlibApi" ) } diff --git a/compiler/daemon/build.gradle.kts b/compiler/daemon/build.gradle.kts index 451d2995f93..888d876e356 100644 --- a/compiler/daemon/build.gradle.kts +++ b/compiler/daemon/build.gradle.kts @@ -43,7 +43,7 @@ javadocJar() tasks { val compileKotlin by existing(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { kotlinOptions { - freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.DelicateCoroutinesApi" + freeCompilerArgs += "-opt-in=kotlinx.coroutines.DelicateCoroutinesApi" } } } diff --git a/compiler/daemon/daemon-client-new/build.gradle.kts b/compiler/daemon/daemon-client-new/build.gradle.kts index 86afc499178..925e86df4c4 100644 --- a/compiler/daemon/daemon-client-new/build.gradle.kts +++ b/compiler/daemon/daemon-client-new/build.gradle.kts @@ -70,7 +70,7 @@ javadocJar() tasks { val compileKotlin by existing(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { kotlinOptions { - freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.DelicateCoroutinesApi" + freeCompilerArgs += "-opt-in=kotlinx.coroutines.DelicateCoroutinesApi" } } } diff --git a/compiler/daemon/daemon-common-new/build.gradle.kts b/compiler/daemon/daemon-common-new/build.gradle.kts index 57ab06edd7b..f2ba04d0cd2 100644 --- a/compiler/daemon/daemon-common-new/build.gradle.kts +++ b/compiler/daemon/daemon-common-new/build.gradle.kts @@ -29,7 +29,7 @@ sourceSets { tasks { val compileKotlin by existing(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { kotlinOptions { - freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.DelicateCoroutinesApi" + freeCompilerArgs += "-opt-in=kotlinx.coroutines.DelicateCoroutinesApi" } } } diff --git a/compiler/fir/build.gradle.kts b/compiler/fir/build.gradle.kts index 3d16b334326..242849143a9 100644 --- a/compiler/fir/build.gradle.kts +++ b/compiler/fir/build.gradle.kts @@ -19,7 +19,7 @@ subprojects { if (name in projectsAllowedToUseFirFromSymbol) { tasks.withType> { kotlinOptions { - freeCompilerArgs += "-Xopt-in=org.jetbrains.kotlin.fir.symbols.SymbolInternals" + freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.fir.symbols.SymbolInternals" } } } diff --git a/compiler/fir/fir2ir/build.gradle.kts b/compiler/fir/fir2ir/build.gradle.kts index d616e553f46..f3ba1fbdc67 100644 --- a/compiler/fir/fir2ir/build.gradle.kts +++ b/compiler/fir/fir2ir/build.gradle.kts @@ -59,7 +59,7 @@ sourceSets { tasks { val compileKotlin by existing(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { kotlinOptions { - freeCompilerArgs += "-Xopt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI" + freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI" } } } diff --git a/compiler/ir/ir.psi2ir/build.gradle.kts b/compiler/ir/ir.psi2ir/build.gradle.kts index babccdc44a5..a177469ed51 100644 --- a/compiler/ir/ir.psi2ir/build.gradle.kts +++ b/compiler/ir/ir.psi2ir/build.gradle.kts @@ -19,7 +19,7 @@ sourceSets { tasks { val compileKotlin by existing(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { kotlinOptions { - freeCompilerArgs += "-Xopt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI" + freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI" } } } diff --git a/compiler/ir/serialization.common/build.gradle.kts b/compiler/ir/serialization.common/build.gradle.kts index bf1dad3703f..6a7fc7aafc8 100644 --- a/compiler/ir/serialization.common/build.gradle.kts +++ b/compiler/ir/serialization.common/build.gradle.kts @@ -23,7 +23,7 @@ sourceSets { tasks { val compileKotlin by existing(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { kotlinOptions { - freeCompilerArgs += "-Xopt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI" + freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI" } } } diff --git a/compiler/visualizer/render-fir/build.gradle.kts b/compiler/visualizer/render-fir/build.gradle.kts index 2137b6aa772..4c4e1b7d769 100644 --- a/compiler/visualizer/render-fir/build.gradle.kts +++ b/compiler/visualizer/render-fir/build.gradle.kts @@ -17,6 +17,6 @@ sourceSets { tasks.withType> { kotlinOptions { - freeCompilerArgs += "-Xopt-in=org.jetbrains.kotlin.fir.symbols.SymbolInternals" + freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.fir.symbols.SymbolInternals" } } diff --git a/idea/idea-frontend-fir/build.gradle.kts b/idea/idea-frontend-fir/build.gradle.kts index d2c691ab4ee..a530a748c86 100644 --- a/idea/idea-frontend-fir/build.gradle.kts +++ b/idea/idea-frontend-fir/build.gradle.kts @@ -67,7 +67,7 @@ testsJar() allprojects { tasks.withType> { kotlinOptions { - freeCompilerArgs += "-Xopt-in=org.jetbrains.kotlin.fir.symbols.SymbolInternals" + freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.fir.symbols.SymbolInternals" } } } diff --git a/kotlin-native/Interop/Runtime/build.gradle.kts b/kotlin-native/Interop/Runtime/build.gradle.kts index c51477bef22..a525099a086 100644 --- a/kotlin-native/Interop/Runtime/build.gradle.kts +++ b/kotlin-native/Interop/Runtime/build.gradle.kts @@ -74,8 +74,8 @@ sourceSets.main.get().java.srcDir("src/jvm/kotlin") tasks.withType().configureEach { kotlinOptions { freeCompilerArgs = listOf( - "-Xopt-in=kotlin.ExperimentalUnsignedTypes", - "-Xopt-in=kotlin.RequiresOptIn", + "-opt-in=kotlin.ExperimentalUnsignedTypes", + "-opt-in=kotlin.RequiresOptIn", "-Xskip-prerelease-check" ) allWarningsAsErrors = true diff --git a/kotlin-native/performance/buildSrc/build.gradle.kts b/kotlin-native/performance/buildSrc/build.gradle.kts index c4d6a9c55a2..bd928e23cc2 100644 --- a/kotlin-native/performance/buildSrc/build.gradle.kts +++ b/kotlin-native/performance/buildSrc/build.gradle.kts @@ -73,9 +73,9 @@ sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourc tasks.withType().configureEach { kotlinOptions.freeCompilerArgs += - listOf("-Xopt-in=kotlin.RequiresOptIn", + listOf("-opt-in=kotlin.RequiresOptIn", "-Xskip-runtime-version-check", - "-Xopt-in=kotlin.ExperimentalStdlibApi") + "-opt-in=kotlin.ExperimentalStdlibApi") } diff --git a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts index a33f56cf9d4..85eb4000f5e 100644 --- a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts +++ b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts @@ -73,9 +73,9 @@ sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourc tasks.withType().configureEach { kotlinOptions.freeCompilerArgs += - listOf("-Xopt-in=kotlin.RequiresOptIn", + listOf("-opt-in=kotlin.RequiresOptIn", "-Xskip-runtime-version-check", - "-Xopt-in=kotlin.ExperimentalStdlibApi") + "-opt-in=kotlin.ExperimentalStdlibApi") } dependencies { diff --git a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts index f92acdaaa4d..8a1e99803bf 100644 --- a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts +++ b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts @@ -71,9 +71,9 @@ sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourc tasks.withType().configureEach { kotlinOptions.freeCompilerArgs += - listOf("-Xopt-in=kotlin.RequiresOptIn", + listOf("-opt-in=kotlin.RequiresOptIn", "-Xskip-runtime-version-check", - "-Xopt-in=kotlin.ExperimentalStdlibApi") + "-opt-in=kotlin.ExperimentalStdlibApi") } dependencies { diff --git a/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts b/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts index 2e9e05578b6..0eb8cba16f2 100644 --- a/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts +++ b/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts @@ -69,9 +69,9 @@ sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourc tasks.withType().configureEach { kotlinOptions.freeCompilerArgs += - listOf("-Xopt-in=kotlin.RequiresOptIn", + listOf("-opt-in=kotlin.RequiresOptIn", "-Xskip-runtime-version-check", - "-Xopt-in=kotlin.ExperimentalStdlibApi") + "-opt-in=kotlin.ExperimentalStdlibApi") } dependencies { diff --git a/libraries/kotlin.test/js-ir/build.gradle.kts b/libraries/kotlin.test/js-ir/build.gradle.kts index c8004740cec..4c9637fd4b1 100644 --- a/libraries/kotlin.test/js-ir/build.gradle.kts +++ b/libraries/kotlin.test/js-ir/build.gradle.kts @@ -49,8 +49,8 @@ kotlin { tasks.withType>().configureEach { kotlinOptions.freeCompilerArgs += listOf( "-Xallow-kotlin-package", - "-Xopt-in=kotlin.ExperimentalMultiplatform", - "-Xopt-in=kotlin.contracts.ExperimentalContracts" + "-opt-in=kotlin.ExperimentalMultiplatform", + "-opt-in=kotlin.contracts.ExperimentalContracts" ) } diff --git a/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts b/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts index f3fab803aaf..147d64a18b2 100644 --- a/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts +++ b/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts @@ -121,11 +121,11 @@ kotlin { tasks.withType> { kotlinOptions.freeCompilerArgs += listOf( "-Xallow-kotlin-package", - "-Xopt-in=kotlin.ExperimentalMultiplatform", - "-Xopt-in=kotlin.contracts.ExperimentalContracts", - "-Xopt-in=kotlin.RequiresOptIn", - "-Xopt-in=kotlin.ExperimentalUnsignedTypes", - "-Xopt-in=kotlin.ExperimentalStdlibApi" + "-opt-in=kotlin.ExperimentalMultiplatform", + "-opt-in=kotlin.contracts.ExperimentalContracts", + "-opt-in=kotlin.RequiresOptIn", + "-opt-in=kotlin.ExperimentalUnsignedTypes", + "-opt-in=kotlin.ExperimentalStdlibApi" ) } diff --git a/libraries/stdlib/js-ir/build.gradle.kts b/libraries/stdlib/js-ir/build.gradle.kts index e87e12ba536..f7df4ee0e36 100644 --- a/libraries/stdlib/js-ir/build.gradle.kts +++ b/libraries/stdlib/js-ir/build.gradle.kts @@ -137,11 +137,11 @@ kotlin { tasks.withType>().configureEach { kotlinOptions.freeCompilerArgs += listOf( "-Xallow-kotlin-package", - "-Xopt-in=kotlin.ExperimentalMultiplatform", - "-Xopt-in=kotlin.contracts.ExperimentalContracts", - "-Xopt-in=kotlin.RequiresOptIn", - "-Xopt-in=kotlin.ExperimentalUnsignedTypes", - "-Xopt-in=kotlin.ExperimentalStdlibApi" + "-opt-in=kotlin.ExperimentalMultiplatform", + "-opt-in=kotlin.contracts.ExperimentalContracts", + "-opt-in=kotlin.RequiresOptIn", + "-opt-in=kotlin.ExperimentalUnsignedTypes", + "-opt-in=kotlin.ExperimentalStdlibApi" ) } diff --git a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts index 0295b380c0a..7b31328801a 100644 --- a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts +++ b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts @@ -59,8 +59,8 @@ tasks.withType { freeCompilerArgs += listOf( "-Xallow-kotlin-package", "-Xmulti-platform", - "-Xopt-in=kotlin.RequiresOptIn", - "-Xopt-in=kotlin.contracts.ExperimentalContracts" + "-opt-in=kotlin.RequiresOptIn", + "-opt-in=kotlin.contracts.ExperimentalContracts" ) moduleName = "kotlin-stdlib" } diff --git a/libraries/stdlib/wasm/build.gradle.kts b/libraries/stdlib/wasm/build.gradle.kts index 377055e344e..7d9801b9f2c 100644 --- a/libraries/stdlib/wasm/build.gradle.kts +++ b/libraries/stdlib/wasm/build.gradle.kts @@ -73,11 +73,11 @@ tasks.withType>().configureEach { kotlinOptions.freeCompilerArgs += listOf( "-Xallow-kotlin-package", - "-Xopt-in=kotlin.ExperimentalMultiplatform", - "-Xopt-in=kotlin.contracts.ExperimentalContracts", - "-Xopt-in=kotlin.RequiresOptIn", - "-Xopt-in=kotlin.ExperimentalUnsignedTypes", - "-Xopt-in=kotlin.ExperimentalStdlibApi" + "-opt-in=kotlin.ExperimentalMultiplatform", + "-opt-in=kotlin.contracts.ExperimentalContracts", + "-opt-in=kotlin.RequiresOptIn", + "-opt-in=kotlin.ExperimentalUnsignedTypes", + "-opt-in=kotlin.ExperimentalStdlibApi" ) } diff --git a/libraries/tools/kotlinp/build.gradle.kts b/libraries/tools/kotlinp/build.gradle.kts index 4675a47fbd7..5a96fa78fe5 100644 --- a/libraries/tools/kotlinp/build.gradle.kts +++ b/libraries/tools/kotlinp/build.gradle.kts @@ -69,6 +69,6 @@ tasks { tasks.withType { kotlinOptions { - freeCompilerArgs += listOf("-Xopt-in=kotlin.RequiresOptIn") + freeCompilerArgs += listOf("-opt-in=kotlin.RequiresOptIn") } } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts index 43c8902ae5d..208a36395bf 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts @@ -42,7 +42,7 @@ sourceSets { tasks.withType> { kotlinOptions { - freeCompilerArgs += "-Xopt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI" + freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI" } } diff --git a/wasm/wasm.ir/build.gradle.kts b/wasm/wasm.ir/build.gradle.kts index 8acead9d371..78ef05504c7 100644 --- a/wasm/wasm.ir/build.gradle.kts +++ b/wasm/wasm.ir/build.gradle.kts @@ -60,7 +60,7 @@ sourceSets { tasks.withType().configureEach { kotlinOptions.freeCompilerArgs += listOf( - "-Xopt-in=kotlin.ExperimentalUnsignedTypes", + "-opt-in=kotlin.ExperimentalUnsignedTypes", "-Xskip-prerelease-check" ) }