From 8a7d86c4e5ede35d8bdf32807a3dbe6ba4ac3712 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <alexander.udalov@jetbrains.com>
Date: Fri, 26 Nov 2021 01:27:28 +0100
Subject: [PATCH] Build: remove obsolete argument -Xskip-runtime-version-check

It was removed in KT-41664.
---
 build.gradle.kts                                            | 1 -
 buildSrc/build.gradle.kts                                   | 1 -
 kotlin-native/performance/buildSrc/build.gradle.kts         | 4 +---
 .../tools/benchmarksAnalyzer/buildSrc/build.gradle.kts      | 6 ++----
 .../tools/performance-server/buildSrc/build.gradle.kts      | 4 +---
 .../tools/performance-server/ui/buildSrc/build.gradle.kts   | 4 +---
 .../src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt  | 2 +-
 7 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 1a0e041357b..879b14e18c6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -506,7 +506,6 @@ allprojects {
         "-Xjvm-default=compatibility",
         "-Xno-optimized-callable-references",
         "-Xno-kotlin-nothing-value-exception",
-        "-Xskip-runtime-version-check",
         "-Xsuppress-deprecated-jvm-target-warning" // Remove as soon as there are no modules for JDK 1.6 & 1.7
     )
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 8f6af311d7a..1123f2a986f 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -199,7 +199,6 @@ tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.allWarningsAsErrors = true
     kotlinOptions.freeCompilerArgs += listOf(
         "-opt-in=kotlin.RequiresOptIn",
-        "-Xskip-runtime-version-check",
         "-Xsuppress-version-warnings",
         "-opt-in=kotlin.ExperimentalStdlibApi"
     )
diff --git a/kotlin-native/performance/buildSrc/build.gradle.kts b/kotlin-native/performance/buildSrc/build.gradle.kts
index a8975705671..5b86a083b24 100644
--- a/kotlin-native/performance/buildSrc/build.gradle.kts
+++ b/kotlin-native/performance/buildSrc/build.gradle.kts
@@ -76,9 +76,7 @@ sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourc
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.freeCompilerArgs +=
-            listOf("-opt-in=kotlin.RequiresOptIn",
-                    "-Xskip-runtime-version-check",
-                    "-opt-in=kotlin.ExperimentalStdlibApi")
+        listOf("-opt-in=kotlin.RequiresOptIn", "-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 e15e79ff9ed..ec2e5721636 100644
--- a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts
+++ b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts
@@ -78,9 +78,7 @@ sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourc
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.freeCompilerArgs +=
-        listOf("-opt-in=kotlin.RequiresOptIn",
-               "-Xskip-runtime-version-check",
-               "-opt-in=kotlin.ExperimentalStdlibApi")
+        listOf("-opt-in=kotlin.RequiresOptIn", "-opt-in=kotlin.ExperimentalStdlibApi")
 }
 
 dependencies {
@@ -119,4 +117,4 @@ afterEvaluate {
             apiVersion = "1.4"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts
index 8e8b1e44f2e..679d6e9e1dd 100644
--- a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts
+++ b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts
@@ -76,9 +76,7 @@ sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourc
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.freeCompilerArgs +=
-        listOf("-opt-in=kotlin.RequiresOptIn",
-               "-Xskip-runtime-version-check",
-               "-opt-in=kotlin.ExperimentalStdlibApi")
+        listOf("-opt-in=kotlin.RequiresOptIn", "-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 0f38b33ab97..162edf73c9f 100644
--- a/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts
+++ b/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts
@@ -74,9 +74,7 @@ sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourc
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.freeCompilerArgs +=
-        listOf("-opt-in=kotlin.RequiresOptIn",
-               "-Xskip-runtime-version-check",
-               "-opt-in=kotlin.ExperimentalStdlibApi")
+        listOf("-opt-in=kotlin.RequiresOptIn", "-opt-in=kotlin.ExperimentalStdlibApi")
 }
 
 dependencies {
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt
index 94540af81e0..d56ce690605 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt
@@ -430,7 +430,7 @@ open class Kapt3IT : Kapt3BaseIT() {
             gradleVersion,
             buildOptions = defaultBuildOptions.copy(logLevel = LogLevel.DEBUG)
         ) {
-            val arg = "-Xskip-runtime-version-check"
+            val arg = "-Xsuppress-version-warnings"
             buildGradle.modify {
                 //language=Gradle
                 """