KT-52217 Rename 'use-fir' to 'use-k2', update message
This commit is contained in:
+2
-2
@@ -20,8 +20,8 @@ interface KotlinCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToo
|
||||
var languageVersion: kotlin.String?
|
||||
|
||||
/**
|
||||
* Compile using Front-end IR. Warning: this feature is far from being production-ready
|
||||
* Compile using experimental K2. K2 is a new compiler pipeline, no compatibility guarantees are yet provided
|
||||
* Default value: false
|
||||
*/
|
||||
var useFir: kotlin.Boolean
|
||||
var useK2: kotlin.Boolean
|
||||
}
|
||||
|
||||
+1
-1
@@ -152,7 +152,7 @@ internal open class GradleCompilerRunner(
|
||||
report(BooleanMetrics.JVM_COMPILER_IR_MODE, args.useIR)
|
||||
report(StringMetrics.JVM_DEFAULTS, args.jvmDefault)
|
||||
report(StringMetrics.USE_OLD_BACKEND, args.useOldBackend.toString())
|
||||
report(StringMetrics.USE_FIR, args.useFir.toString())
|
||||
report(StringMetrics.USE_FIR, args.useK2.toString())
|
||||
}
|
||||
}
|
||||
is K2JSCompilerArguments -> {
|
||||
|
||||
+6
-6
@@ -30,11 +30,11 @@ internal abstract class KotlinJsOptionsBase : org.jetbrains.kotlin.gradle.dsl.Ko
|
||||
|
||||
override var languageVersion: kotlin.String? = null
|
||||
|
||||
private var useFirField: kotlin.Boolean? = null
|
||||
override var useFir: kotlin.Boolean
|
||||
get() = useFirField ?: false
|
||||
private var useK2Field: kotlin.Boolean? = null
|
||||
override var useK2: kotlin.Boolean
|
||||
get() = useK2Field ?: false
|
||||
set(value) {
|
||||
useFirField = value
|
||||
useK2Field = value
|
||||
}
|
||||
|
||||
private var friendModulesDisabledField: kotlin.Boolean? = null
|
||||
@@ -105,7 +105,7 @@ internal abstract class KotlinJsOptionsBase : org.jetbrains.kotlin.gradle.dsl.Ko
|
||||
verboseField?.let { args.verbose = it }
|
||||
apiVersion?.let { args.apiVersion = it }
|
||||
languageVersion?.let { args.languageVersion = it }
|
||||
useFirField?.let { args.useFir = it }
|
||||
useK2Field?.let { args.useK2 = it }
|
||||
friendModulesDisabledField?.let { args.friendModulesDisabled = it }
|
||||
mainField?.let { args.main = it }
|
||||
metaInfoField?.let { args.metaInfo = it }
|
||||
@@ -126,7 +126,7 @@ internal fun org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments.fil
|
||||
verbose = false
|
||||
apiVersion = null
|
||||
languageVersion = null
|
||||
useFir = false
|
||||
useK2 = false
|
||||
friendModulesDisabled = false
|
||||
main = "call"
|
||||
metaInfo = true
|
||||
|
||||
+6
-6
@@ -30,11 +30,11 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K
|
||||
|
||||
override var languageVersion: kotlin.String? = null
|
||||
|
||||
private var useFirField: kotlin.Boolean? = null
|
||||
override var useFir: kotlin.Boolean
|
||||
get() = useFirField ?: false
|
||||
private var useK2Field: kotlin.Boolean? = null
|
||||
override var useK2: kotlin.Boolean
|
||||
get() = useK2Field ?: false
|
||||
set(value) {
|
||||
useFirField = value
|
||||
useK2Field = value
|
||||
}
|
||||
|
||||
private var javaParametersField: kotlin.Boolean? = null
|
||||
@@ -68,7 +68,7 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K
|
||||
verboseField?.let { args.verbose = it }
|
||||
apiVersion?.let { args.apiVersion = it }
|
||||
languageVersion?.let { args.languageVersion = it }
|
||||
useFirField?.let { args.useFir = it }
|
||||
useK2Field?.let { args.useK2 = it }
|
||||
javaParametersField?.let { args.javaParameters = it }
|
||||
jvmTarget?.let { args.jvmTarget = it }
|
||||
moduleName?.let { args.moduleName = it }
|
||||
@@ -83,7 +83,7 @@ internal fun org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments.fi
|
||||
verbose = false
|
||||
apiVersion = null
|
||||
languageVersion = null
|
||||
useFir = false
|
||||
useK2 = false
|
||||
javaParameters = false
|
||||
jvmTarget = null
|
||||
moduleName = null
|
||||
|
||||
+6
-6
@@ -30,11 +30,11 @@ internal abstract class KotlinMultiplatformCommonOptionsBase : org.jetbrains.kot
|
||||
|
||||
override var languageVersion: kotlin.String? = null
|
||||
|
||||
private var useFirField: kotlin.Boolean? = null
|
||||
override var useFir: kotlin.Boolean
|
||||
get() = useFirField ?: false
|
||||
private var useK2Field: kotlin.Boolean? = null
|
||||
override var useK2: kotlin.Boolean
|
||||
get() = useK2Field ?: false
|
||||
set(value) {
|
||||
useFirField = value
|
||||
useK2Field = value
|
||||
}
|
||||
|
||||
internal open fun updateArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments) {
|
||||
@@ -43,7 +43,7 @@ internal abstract class KotlinMultiplatformCommonOptionsBase : org.jetbrains.kot
|
||||
verboseField?.let { args.verbose = it }
|
||||
apiVersion?.let { args.apiVersion = it }
|
||||
languageVersion?.let { args.languageVersion = it }
|
||||
useFirField?.let { args.useFir = it }
|
||||
useK2Field?.let { args.useK2 = it }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,5 +53,5 @@ internal fun org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArgumen
|
||||
verbose = false
|
||||
apiVersion = null
|
||||
languageVersion = null
|
||||
useFir = false
|
||||
useK2 = false
|
||||
}
|
||||
|
||||
+2
-2
@@ -132,8 +132,8 @@ internal class PropertiesProvider private constructor(private val project: Proje
|
||||
val useKotlinAbiSnapshot: Boolean
|
||||
get() = booleanProperty(KOTLIN_ABI_SNAPSHOT) ?: false
|
||||
|
||||
val useFir: Boolean?
|
||||
get() = booleanProperty("kotlin.useFir")
|
||||
val useK2: Boolean?
|
||||
get() = booleanProperty("kotlin.useK2")
|
||||
|
||||
val keepMppDependenciesIntactInPoms: Boolean?
|
||||
get() = booleanProperty("kotlin.mpp.keepMppDependenciesIntactInPoms")
|
||||
|
||||
+2
-2
@@ -36,8 +36,8 @@ internal class NativeCompileOptions(languageSettingsProvider: () -> LanguageSett
|
||||
set(value) {
|
||||
languageSettings.languageVersion = value
|
||||
}
|
||||
|
||||
override var useFir: Boolean
|
||||
|
||||
override var useK2: Boolean
|
||||
get() = false
|
||||
set(@Suppress("UNUSED_PARAMETER") value) {}
|
||||
|
||||
|
||||
+2
-2
@@ -39,8 +39,8 @@ internal open class BaseKotlinCompileConfig<TASK : KotlinCompile> : AbstractKotl
|
||||
taskProvider.configure { task ->
|
||||
task.incremental = propertiesProvider.incrementalJvm ?: true
|
||||
|
||||
if (propertiesProvider.useFir == true) {
|
||||
task.kotlinOptions.useFir = true
|
||||
if (propertiesProvider.useK2 == true) {
|
||||
task.kotlinOptions.useK2 = true
|
||||
}
|
||||
task.usePreciseJavaTracking = propertiesProvider.usePreciseJavaTracking ?: true
|
||||
task.jvmTargetValidationMode.set(propertiesProvider.jvmTargetValidationMode)
|
||||
|
||||
Reference in New Issue
Block a user