Remove obsolete kotlin.build.useIR flag
(cherry picked from commit 91e47f1fd7)
This commit is contained in:
@@ -153,7 +153,6 @@ if (!project.hasProperty("versions.kotlin-native")) {
|
||||
|
||||
val effectSystemEnabled by extra(project.getBooleanProperty("kotlin.compiler.effectSystemEnabled") ?: false)
|
||||
val newInferenceEnabled by extra(project.getBooleanProperty("kotlin.compiler.newInferenceEnabled") ?: false)
|
||||
val useJvmIrBackend by extra(project.kotlinBuildProperties.useIR)
|
||||
val useJvmFir by extra(project.kotlinBuildProperties.useFir)
|
||||
|
||||
val intellijSeparateSdks = project.getBooleanProperty("intellijSeparateSdks") ?: false
|
||||
@@ -475,10 +474,6 @@ allprojects {
|
||||
kotlinOptions {
|
||||
freeCompilerArgs = commonCompilerArgs + jvmCompilerArgs
|
||||
|
||||
if (useJvmIrBackend) {
|
||||
useIR = true
|
||||
}
|
||||
|
||||
if (useJvmFir && this@allprojects.path !in projectsWithDisabledFirBootstrap) {
|
||||
freeCompilerArgs += "-Xuse-fir"
|
||||
freeCompilerArgs += "-Xabi-stability=stable"
|
||||
|
||||
@@ -42,7 +42,8 @@ tasks.withType<KotlinCompile> {
|
||||
kotlinOptions.freeCompilerArgs += listOf(
|
||||
"-Xskip-prerelease-check",
|
||||
"-Xskip-runtime-version-check",
|
||||
"-Xsuppress-version-warnings"
|
||||
"-Xsuppress-version-warnings",
|
||||
"-Xuse-ir" // Needed as long as languageVersion is less than 1.5.
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -80,8 +80,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")
|
||||
|
||||
+1
-3
@@ -10,9 +10,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/
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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
|
||||
kotlinNativeVersionInResources=true
|
||||
|
||||
Reference in New Issue
Block a user