From da077b53532f1b783b4dc2fae32c6ce36d4d2353 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Fri, 27 Dec 2019 16:35:34 +0100
Subject: [PATCH] Rename UseExperimental->OptIn, Experimental->RequiresOptIn in
 Gradle plugin

---
 .../kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt  | 4 ++--
 .../gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt   | 2 +-
 .../kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt   | 4 ++--
 3 files changed, 5 insertions(+), 5 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 b72fc6174b4..6612a4b4709 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
@@ -542,8 +542,8 @@ class NewMultiplatformIT : BaseGradleIT() {
                 assertTasksExecuted(":$it")
                 assertContains(
                     "-language-version 1.3", "-api-version 1.3", "-XXLanguage:+InlineClasses",
-                    " -progressive", "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes",
-                    "-Xuse-experimental=kotlin.contracts.ExperimentalContracts"
+                    " -progressive", "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
+                    "-Xopt-in=kotlin.contracts.ExperimentalContracts"
                 )
             }
         }
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 faa6d14599e..1ea4f90f7ae 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
@@ -103,7 +103,7 @@ internal fun applyLanguageSettingsToKotlinTask(
     }
 
     languageSettingsBuilder.experimentalAnnotationsInUse.forEach { annotationName ->
-        freeCompilerArgs += "-Xuse-experimental=$annotationName"
+        freeCompilerArgs += "-Xopt-in=$annotationName"
     }
 }
 
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 068e8bd37c5..195993703d0 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
@@ -354,7 +354,7 @@ open class KotlinNativeCompile : AbstractKotlinNativeCompile<KotlinCommonOptions
             add("-XXLanguage:+$featureName")
         }
         experimentalAnnotationsInUse.forEach { annotationName ->
-            add("-Xuse-experimental=$annotationName")
+            add("-Xopt-in=$annotationName")
         }
     }
 
@@ -545,7 +545,7 @@ open class KotlinNativeLink : AbstractKotlinNativeCompile<KotlinCommonToolOption
                     add("-XXLanguage:+$featureName")
                 }
                 it.experimentalAnnotationsInUse.forEach { annotationName ->
-                    add("-Xuse-experimental=$annotationName")
+                    add("-Xopt-in=$annotationName")
                 }
             }
         }