From c3515cc3380f8a87ab9dc6f9543a6ab3c211bd2f Mon Sep 17 00:00:00 2001
From: Alexander Likhachev <Alexander.Likhachev@jetbrains.com>
Date: Wed, 14 Jul 2021 17:51:20 +0300
Subject: [PATCH] [Gradle] Use compiler argument `-opt-in` instead of
 '-Xopt-in'

#KT-35832 Fixed
---
 .../kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt  | 4 ++--
 .../org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt       | 4 ++--
 .../gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt   | 2 +-
 .../kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
index 1ceba3d6e1d..fd1212462c0 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
@@ -748,8 +748,8 @@ class NewMultiplatformIT : BaseGradleIT() {
                 assertTasksExecuted(":$it")
                 assertContains(
                     "-XXLanguage:+InlineClasses",
-                    "-progressive", "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
-                    "-Xopt-in=kotlin.contracts.ExperimentalContracts",
+                    "-progressive", "-opt-in=kotlin.ExperimentalUnsignedTypes",
+                    "-opt-in=kotlin.contracts.ExperimentalContracts",
                     "-Xno-inline"
                 )
             }
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt
index 375b68c4be0..6fa3a41fc86 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt
@@ -213,8 +213,8 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
     fun testUseExperimentalAnnotationShouldProduceWarning(gradleVersion: GradleVersion) {
         project("optInAnnotation", gradleVersion, buildOptions = defaultBuildOptions.copy(logLevel = LogLevel.DEBUG)) {
             build("assemble") {
-                assertOutputContains("-Xopt-in=kotlin.RequiresOptIn")
-                assertOutputContains("-Xopt-in=FooAnnotation")
+                assertOutputContains("-opt-in=kotlin.RequiresOptIn")
+                assertOutputContains("-opt-in=FooAnnotation")
                 assertOutputContains("is deprecated and will be removed in next major releases")
             }
         }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt
index fd8abf40bb5..8fc3672901f 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt
@@ -138,7 +138,7 @@ internal fun applyLanguageSettingsToKotlinOptions(
         }
     
         languageSettingsBuilder.optInAnnotationsInUse.forEach { annotationName ->
-            add("-Xopt-in=$annotationName")
+            add("-opt-in=$annotationName")
         }
 
         if (languageSettingsBuilder is DefaultLanguageSettingsBuilder) {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
index 00c3882acfe..9c79b0d8de5 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
@@ -463,7 +463,7 @@ constructor(
             add("-XXLanguage:+$featureName")
         }
         optInAnnotationsInUse.forEach { annotationName ->
-            add("-Xopt-in=$annotationName")
+            add("-opt-in=$annotationName")
         }
     }
 
@@ -629,7 +629,7 @@ constructor(
                 add("-XXLanguage:+$featureName")
             }
             it.optInAnnotationsInUse.forEach { annotationName ->
-                add("-Xopt-in=$annotationName")
+                add("-opt-in=$annotationName")
             }
         }
     }