From e0643a41859565749192400aa291415e5f1b10da Mon Sep 17 00:00:00 2001
From: Alexander Udalov <alexander.udalov@jetbrains.com>
Date: Sun, 25 Jul 2021 18:37:51 +0200
Subject: [PATCH] Build: use -Xskip-runtime-version-check globally in project

---
 build.gradle.kts                                            | 1 +
 .../kotlin/gradle-plugin-common-configuration.gradle.kts    | 1 -
 compiler/tests-mutes/tc-integration/build.gradle.kts        | 3 ---
 libraries/tools/kotlin-serialization/build.gradle           | 4 ----
 plugins/pill/pill-importer/build.gradle.kts                 | 6 ------
 5 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 7f09e1422b1..ed5c4b2573b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -460,6 +460,7 @@ 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/src/main/kotlin/gradle-plugin-common-configuration.gradle.kts b/buildSrc/src/main/kotlin/gradle-plugin-common-configuration.gradle.kts
index cb0b4b1e25a..2beaaeceef9 100644
--- a/buildSrc/src/main/kotlin/gradle-plugin-common-configuration.gradle.kts
+++ b/buildSrc/src/main/kotlin/gradle-plugin-common-configuration.gradle.kts
@@ -41,7 +41,6 @@ tasks.withType<KotlinCompile> {
     kotlinOptions.apiVersion = "1.4"
     kotlinOptions.freeCompilerArgs += listOf(
         "-Xskip-prerelease-check",
-        "-Xskip-runtime-version-check",
         "-Xsuppress-version-warnings",
         "-Xuse-ir" // Needed as long as languageVersion is less than 1.5.
     )
diff --git a/compiler/tests-mutes/tc-integration/build.gradle.kts b/compiler/tests-mutes/tc-integration/build.gradle.kts
index 72ba12d6923..f80ceea9d5b 100644
--- a/compiler/tests-mutes/tc-integration/build.gradle.kts
+++ b/compiler/tests-mutes/tc-integration/build.gradle.kts
@@ -16,9 +16,6 @@ sourceSets {
     "test" {}
 }
 
-val compileKotlin: org.jetbrains.kotlin.gradle.tasks.KotlinCompile by tasks
-compileKotlin.kotlinOptions.freeCompilerArgs += "-Xskip-runtime-version-check"
-
 val mutesPackageName = "org.jetbrains.kotlin.test.mutes"
 
 application {
diff --git a/libraries/tools/kotlin-serialization/build.gradle b/libraries/tools/kotlin-serialization/build.gradle
index 9c9f88fc36a..ec43a9281b6 100644
--- a/libraries/tools/kotlin-serialization/build.gradle
+++ b/libraries/tools/kotlin-serialization/build.gradle
@@ -17,10 +17,6 @@ dependencies {
     embedded(project(":kotlinx-serialization-compiler-plugin")) { transitive = false }
 }
 
-tasks.withType(project.compileKotlin.class) {
-    kotlinOptions.freeCompilerArgs += ["-Xskip-runtime-version-check"]
-}
-
 jar {
     manifestAttributes(manifest, project)
 }
diff --git a/plugins/pill/pill-importer/build.gradle.kts b/plugins/pill/pill-importer/build.gradle.kts
index 95a38bbe0f2..ddf23ea8ef1 100644
--- a/plugins/pill/pill-importer/build.gradle.kts
+++ b/plugins/pill/pill-importer/build.gradle.kts
@@ -43,9 +43,3 @@ val unpill by tasks.creating {
     dependsOn(jar)
     doLast { runPillTask("unpill") }
 }
-
-tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + "-Xskip-runtime-version-check"
-    }
-}