From 91e47f1fd75693d6d3bb20317bd16cfbf53d80e9 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 21 May 2021 12:33:15 +0200 Subject: [PATCH] Remove obsolete kotlin.build.useIR flag --- .../kotlin-build-gradle-plugin/src/BuildProperties.kt | 2 -- gradle.properties | 4 +--- kotlin-native/build.gradle | 9 --------- kotlin-native/gradle.properties | 4 +--- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt b/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt index 271c0874b32..ae675acde6e 100644 --- a/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt +++ b/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt @@ -89,8 +89,6 @@ class KotlinBuildProperties( val localBootstrapPath: String? = getOrNull("bootstrap.local.path") as String? - val useIR: Boolean = getBoolean("kotlin.build.useIR") - val useIRForLibraries: Boolean = getBoolean("kotlin.build.useIRForLibraries") val useFir: Boolean = getBoolean("kotlin.build.useFir") diff --git a/gradle.properties b/gradle.properties index 1e8246f69f7..a08adef34ea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,9 +9,7 @@ defaultSnapshotVersion=1.5.255-SNAPSHOT kotlin.compiler.effectSystemEnabled=true kotlin.compiler.newInferenceEnabled=true -# Enable JVM IR backend for all modules except libraries such as kotlin-stdlib, kotlin-reflect, kotlin-test. -kotlin.build.useIR=true -# Enable JVM IR backend for the libraries mentioned above. +# Enable JVM IR backend for kotlin-stdlib, kotlin-reflect, kotlin-test. kotlin.build.useIRForLibraries=true #maven.repository.mirror=http://repository.jetbrains.com/remote-repos/ diff --git a/kotlin-native/build.gradle b/kotlin-native/build.gradle index 12153b8967e..241a14721b5 100644 --- a/kotlin-native/build.gradle +++ b/kotlin-native/build.gradle @@ -120,15 +120,6 @@ allprojects { } } - if (findProperty("kotlin.build.useIR") == "true") { - tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { - kotlinOptions { - useIR = true - freeCompilerArgs += ["-Xir-binary-with-stable-abi"] - } - } - } - setupHostAndTarget() loadCommandLineProperties() loadLocalProperties() diff --git a/kotlin-native/gradle.properties b/kotlin-native/gradle.properties index b3e1adec0da..3aba2c9f818 100644 --- a/kotlin-native/gradle.properties +++ b/kotlin-native/gradle.properties @@ -34,6 +34,4 @@ ktorVersion=1.2.1 shadowVersion=5.1.0 metadataVersion=0.0.1-dev-10 -# Uncomment to compile Kotlin/Native backend modules with JVM IR backend. -# kotlin.build.useIR=true -kotlinNativeVersionInResources=true \ No newline at end of file +kotlinNativeVersionInResources=true