Migrate -Xopt-in to -opt-in in Gradle Kotlin scripts

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") }
     )
 

buildSrc/build.gradle.kts

@@ -197,10 +197,10 @@ java {
 tasks.withType<KotlinCompile>().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"
     )
 }
 

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"
         }
     }
 }

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"
         }
     }
 }

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"
         }
     }
 }

compiler/fir/build.gradle.kts

@@ -19,7 +19,7 @@ subprojects {
     if (name in projectsAllowedToUseFirFromSymbol) {
         tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
             kotlinOptions {
-                freeCompilerArgs += "-Xopt-in=org.jetbrains.kotlin.fir.symbols.SymbolInternals"
+                freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.fir.symbols.SymbolInternals"
             }
         }
     }

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"
         }
     }
 }

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"
         }
     }
 }

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"
         }
     }
 }

compiler/visualizer/render-fir/build.gradle.kts

@@ -17,6 +17,6 @@ sourceSets {
 
 tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=org.jetbrains.kotlin.fir.symbols.SymbolInternals"
+        freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.fir.symbols.SymbolInternals"
     }
 }

idea/idea-frontend-fir/build.gradle.kts

@@ -67,7 +67,7 @@ testsJar()
 allprojects {
     tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
         kotlinOptions {
-            freeCompilerArgs += "-Xopt-in=org.jetbrains.kotlin.fir.symbols.SymbolInternals"
+            freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.fir.symbols.SymbolInternals"
         }
     }
 }

kotlin-native/Interop/Runtime/build.gradle.kts

@@ -74,8 +74,8 @@ sourceSets.main.get().java.srcDir("src/jvm/kotlin")
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().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

kotlin-native/performance/buildSrc/build.gradle.kts

@@ -73,9 +73,9 @@ sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourc
 
 tasks.withType<KotlinCompile>().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")
 }
 
 

kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts

@@ -73,9 +73,9 @@ sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourc
 
 tasks.withType<KotlinCompile>().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 {

kotlin-native/tools/performance-server/buildSrc/build.gradle.kts

@@ -71,9 +71,9 @@ sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourc
 
 tasks.withType<KotlinCompile>().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 {

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<KotlinCompile>().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 {

libraries/kotlin.test/js-ir/build.gradle.kts

@@ -49,8 +49,8 @@ kotlin {
 tasks.withType<KotlinCompile<*>>().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"
     )
 }
 

libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts

@@ -121,11 +121,11 @@ kotlin {
 tasks.withType<KotlinCompile<*>> {
     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"
     )
 }
 

libraries/stdlib/js-ir/build.gradle.kts

@@ -137,11 +137,11 @@ kotlin {
 tasks.withType<KotlinCompile<*>>().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"
     )
 }
 

libraries/stdlib/jvm-minimal-for-test/build.gradle.kts

@@ -59,8 +59,8 @@ tasks.withType<KotlinCompile> {
         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"
     }

libraries/stdlib/wasm/build.gradle.kts

@@ -73,11 +73,11 @@ tasks.withType<KotlinCompile<*>>().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"
     )
 }
 

libraries/tools/kotlinp/build.gradle.kts

@@ -69,6 +69,6 @@ tasks {
 
 tasks.withType<KotlinCompile> {
     kotlinOptions {
-        freeCompilerArgs += listOf("-Xopt-in=kotlin.RequiresOptIn")
+        freeCompilerArgs += listOf("-opt-in=kotlin.RequiresOptIn")
     }
 }

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

@@ -42,7 +42,7 @@ sourceSets {
 
 tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI"
+        freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI"
     }
 }
 

wasm/wasm.ir/build.gradle.kts

@@ -60,7 +60,7 @@ sourceSets {
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
     kotlinOptions.freeCompilerArgs += listOf(
-        "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
+        "-opt-in=kotlin.ExperimentalUnsignedTypes",
         "-Xskip-prerelease-check"
     )
 }