From 8b2f0d644b20b647b4bbf34533e35122173251c0 Mon Sep 17 00:00:00 2001
From: Vasily Levchenko <vasily.v.levchenko@gmail.com>
Date: Wed, 27 Jan 2021 15:18:17 +0100
Subject: [PATCH] [build] kotlin.*Compile: -Xskip-prerelease-check

(cherry picked from commit 57172ac6ead928b565fefaf49d8405a07c856e25)
---
 kotlin-native/Interop/Indexer/build.gradle                  | 1 +
 kotlin-native/Interop/Runtime/build.gradle                  | 2 +-
 kotlin-native/backend.native/build.gradle                   | 6 +++++-
 kotlin-native/backend.native/tests/build.gradle             | 4 ++++
 .../groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy  | 1 +
 kotlin-native/klib/build.gradle                             | 4 ++++
 kotlin-native/shared/build.gradle.kts                       | 1 +
 .../tools/kotlin-native-gradle-plugin/build.gradle          | 4 ++++
 8 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/kotlin-native/Interop/Indexer/build.gradle b/kotlin-native/Interop/Indexer/build.gradle
index 93d3ae019fd..a9b94b00d74 100644
--- a/kotlin-native/Interop/Indexer/build.gradle
+++ b/kotlin-native/Interop/Indexer/build.gradle
@@ -144,6 +144,7 @@ kotlinNativeInterop {
 compileKotlin {
     kotlinOptions {
         allWarningsAsErrors=true
+	kotlinOptions.freeCompilerArgs = ["-Xskip-prerelease-check"]
     }
 }
 
diff --git a/kotlin-native/Interop/Runtime/build.gradle b/kotlin-native/Interop/Runtime/build.gradle
index 273e3b2e962..c90aa241156 100644
--- a/kotlin-native/Interop/Runtime/build.gradle
+++ b/kotlin-native/Interop/Runtime/build.gradle
@@ -76,7 +76,7 @@ sourceSets.main.kotlin.srcDirs += "src/jvm/kotlin"
 compileKotlin {
     kotlinOptions {
         freeCompilerArgs = ['-Xuse-experimental=kotlin.ExperimentalUnsignedTypes', '-Xuse-experimental=kotlin.Experimental',
-                            '-Xopt-in=kotlin.RequiresOptIn', "-XXLanguage:+InlineClasses"]
+                            '-Xopt-in=kotlin.RequiresOptIn', "-XXLanguage:+InlineClasses", "-Xskip-prerelease-check"]
         allWarningsAsErrors=true
     }
 }
diff --git a/kotlin-native/backend.native/build.gradle b/kotlin-native/backend.native/build.gradle
index e5da6cc46e9..be75830d275 100644
--- a/kotlin-native/backend.native/build.gradle
+++ b/kotlin-native/backend.native/build.gradle
@@ -57,7 +57,11 @@ compileCompilerKotlin {
     dependsOn('generateCompilerProto')
     kotlinOptions.jvmTarget = "1.8"
     kotlinOptions.allWarningsAsErrors=true
-    kotlinOptions.freeCompilerArgs += ['-Xopt-in=kotlin.RequiresOptIn', '-Xopt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI']
+    kotlinOptions.freeCompilerArgs += ['-Xopt-in=kotlin.RequiresOptIn', '-Xopt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI', '-Xskip-prerelease-check']
+}
+
+compileCli_bcKotlin {
+    kotlinOptions.freeCompilerArgs += ['-Xskip-prerelease-check']
 }
 
 compileCompilerJava {
diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle
index 12f3fdda098..60ea4d33b1a 100644
--- a/kotlin-native/backend.native/tests/build.gradle
+++ b/kotlin-native/backend.native/tests/build.gradle
@@ -5023,6 +5023,10 @@ sourceSets {
     }
 }
 
+compileNopPluginKotlin {
+    kotlinOptions.freeCompilerArgs += ['-Xskip-prerelease-check']
+}
+
 Task pluginTest(String name, String pluginName, Closure configureClosure) {
     def jarTask = project.tasks.register("jar-$pluginName", Jar) {
         it.dependsOn("compile${pluginName.capitalize()}Kotlin")
diff --git a/kotlin-native/build-tools/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy b/kotlin-native/build-tools/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy
index 5db18fb4552..84125a01689 100644
--- a/kotlin-native/build-tools/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy
+++ b/kotlin-native/build-tools/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy
@@ -183,6 +183,7 @@ class NamedNativeInteropConfig implements Named {
             configuration = project.configurations.create(interopStubs.name)
             project.tasks.getByName(interopStubs.getTaskName("compile", "Kotlin")) {
                 dependsOn genTask
+                kotlinOptions.freeCompilerArgs = ["-Xskip-prerelease-check"]
             }
 
             interopStubs.kotlin.srcDirs generatedSrcDir
diff --git a/kotlin-native/klib/build.gradle b/kotlin-native/klib/build.gradle
index 817e8e2fed5..0279bb779f6 100644
--- a/kotlin-native/klib/build.gradle
+++ b/kotlin-native/klib/build.gradle
@@ -37,6 +37,10 @@ konanArtifacts {
     }
 }
 
+compileKotlin {
+    kotlinOptions.freeCompilerArgs += ['-Xskip-prerelease-check']
+}
+
 repositories {
     maven {
         url buildKotlinCompilerRepo
diff --git a/kotlin-native/shared/build.gradle.kts b/kotlin-native/shared/build.gradle.kts
index c083af8e4f3..742198563b4 100644
--- a/kotlin-native/shared/build.gradle.kts
+++ b/kotlin-native/shared/build.gradle.kts
@@ -54,6 +54,7 @@ sourceSets["main"].withConvention(KotlinSourceSet::class) {
 tasks.withType<KotlinCompile> {
     dependsOn(generateCompilerVersion)
     kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.freeCompilerArgs = listOf("-Xskip-prerelease-check")
 }
 
 tasks.clean {
diff --git a/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle b/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle
index c1c0a85232c..9dc3962f52d 100644
--- a/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle
+++ b/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle
@@ -67,6 +67,10 @@ configurations {
     testImplementation.extendsFrom bundleDependencies
 }
 
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    kotlinOptions.freeCompilerArgs = ["-Xskip-prerelease-check"]
+}
+
 dependencies {
     shadow "org.jetbrains.kotlin:kotlin-stdlib:1.3.0"