azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add '-progressive' option into Gradle compiler options DSL

Browse Source 
^KT-53923 Fixed
This commit is contained in:
Yahor Berdnikau
2023-03-02 16:58:57 +01:00
committed by Space Team
parent 8bb0c5135b
commit 5ddd60a015
9 changed files with 157 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt
+4
View File
@@ -85,6 +85,10 @@ abstract class CommonCompilerArguments : CommonToolArguments() {
field = if (value.isNullOrEmpty()) null else value
}
@GradleOption(
value = DefaultValue.BOOLEAN_FALSE_DEFAULT,
gradleInputType = GradleInputTypes.INPUT
)
@Argument(
value = "-progressive",
deprecatedName = "-Xprogressive",
generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+1 -1
View File
@@ -753,7 +753,7 @@ private fun Printer.generateDoc(property: KProperty1<*, *>) {
val defaultValue = property.gradleDefaultValue
println("/**")
println(" * $description")
println(" * ${description.replace("\n", " ")}")
if (possibleValues != null) {
println(" * Possible values: ${possibleValues.joinToString()}")
}
libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api
+1
View File
@@ -166,6 +166,7 @@ public abstract interface class org/jetbrains/kotlin/gradle/dsl/KotlinCommonComp
public abstract fun getApiVersion ()Lorg/gradle/api/provider/Property;
public abstract fun getLanguageVersion ()Lorg/gradle/api/provider/Property;
public abstract fun getOptIn ()Lorg/gradle/api/provider/ListProperty;
public abstract fun getProgressiveMode ()Lorg/gradle/api/provider/Property;
public abstract fun getUseK2 ()Lorg/gradle/api/provider/Property;
}
libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions.kt
+7
View File
@@ -32,6 +32,13 @@ interface KotlinCommonCompilerOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCo
@get:org.gradle.api.tasks.Input
val optIn: org.gradle.api.provider.ListProperty<kotlin.String>
/**
* Enable progressive compiler mode. In this mode, deprecations and bug fixes for unstable code take effect immediately, instead of going through a graceful migration cycle. Code written in the progressive mode is backward compatible; however, code written in non-progressive mode may cause compilation errors in the progressive mode.
* Default value: false
*/
@get:org.gradle.api.tasks.Input
val progressiveMode: org.gradle.api.provider.Property<kotlin.Boolean>
/**
* Compile using experimental K2. K2 is a new compiler pipeline, no compatibility guarantees are yet provided
* Default value: false
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CompilerOptionsIT.kt
+134
View File
@@ -299,4 +299,138 @@ internal class CompilerOptionsIT : KGPBaseTest() {
}
}
}
@DisplayName("Should pass -progressive from compiler options DSL")
@JvmGradlePluginTests
@GradleTest
fun passesProgressive(gradleVersion: GradleVersion) {
project(
projectName = "simpleProject",
gradleVersion = gradleVersion,
buildOptions = defaultBuildOptions.copy(logLevel = LogLevel.DEBUG)
) {
buildGradle.appendText(
//language=Groovy
"""
|
|tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask.class).configureEach {
| compilerOptions.progressiveMode.set(true)
|}
""".trimMargin()
)
build("compileKotlin") {
val compilerArgs = output
.lineSequence()
.first {
it.contains("Kotlin compiler args:")
}
.substringAfter("Kotlin compiler args:")
val expectedArg = "-progressive"
assert(compilerArgs.contains(expectedArg)) {
printBuildOutput()
"compiler arguments does not contain '$expectedArg' - actual value: $compilerArgs"
}
}
}
}
@DisplayName("Should not pass -progressive by default from compiler options DSL")
@JvmGradlePluginTests
@GradleTest
fun notPassesDefaultProgressive(gradleVersion: GradleVersion) {
project(
projectName = "simpleProject",
gradleVersion = gradleVersion,
buildOptions = defaultBuildOptions.copy(logLevel = LogLevel.DEBUG)
) {
build("compileKotlin") {
val compilerArgs = output
.lineSequence()
.first {
it.contains("Kotlin compiler args:")
}
.substringAfter("Kotlin compiler args:")
val expectedArg = "-progressive"
assert(!compilerArgs.contains(expectedArg)) {
printBuildOutput()
"compiler arguments contains '$expectedArg' - actual value: $compilerArgs"
}
}
}
}
@DisplayName("Should pass -progressive from languageSettings if compiler options DSL is not configured")
@JvmGradlePluginTests
@GradleTest
fun passesProgressiveFromLanguageSettings(gradleVersion: GradleVersion) {
project(
projectName = "simpleProject",
gradleVersion = gradleVersion,
buildOptions = defaultBuildOptions.copy(logLevel = LogLevel.DEBUG)
) {
buildGradle.appendText(
//language=Groovy
"""
|
|kotlin.sourceSets.all {
| languageSettings {
| progressiveMode = true
| }
|}
""".trimMargin()
)
build("compileKotlin") {
val compilerArgs = output
.lineSequence()
.first {
it.contains("Kotlin compiler args:")
}
.substringAfter("Kotlin compiler args:")
val expectedArg = "-progressive"
assert(compilerArgs.contains(expectedArg)) {
printBuildOutput()
"compiler arguments does not contain '$expectedArg' - actual value: $compilerArgs"
}
}
}
}
@DisplayName("Should pass -progressive from compiler options DSL in native project")
@NativeGradlePluginTests
@GradleTest
fun passesProgressiveModeNative(gradleVersion: GradleVersion) {
nativeProject(
projectName = "native-link-simple",
gradleVersion = gradleVersion,
) {
buildGradle.appendText(
//language=Groovy
"""
|
|tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask.class).configureEach {
| compilerOptions.progressiveMode.set(true)
|}
""".trimMargin()
)
build("compileKotlinHost", forceOutput = true) {
val expectedArg = "-progressive"
val compilerArgs = output
.substringAfter("Arguments = [")
.substringBefore("]")
.lines()
val progressiveArg = compilerArgs.find { it.trim() == expectedArg }
assert(progressiveArg != null) {
printBuildOutput()
"compiler arguments does not contain '$expectedArg': ${compilerArgs.joinToString()}"
}
}
}
}
}
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptionsDefault.kt
+5
View File
@@ -18,6 +18,9 @@ internal abstract class KotlinCommonCompilerOptionsDefault @javax.inject.Inject
override val optIn: org.gradle.api.provider.ListProperty<kotlin.String> =
objectFactory.listProperty(kotlin.String::class.java).convention(emptyList<String>())
override val progressiveMode: org.gradle.api.provider.Property<kotlin.Boolean> =
objectFactory.property(kotlin.Boolean::class.java).convention(false)
@Deprecated(message = "Compiler flag -Xuse-k2 is deprecated; please use language version 2.0 instead", level = DeprecationLevel.WARNING)
override val useK2: org.gradle.api.provider.Property<kotlin.Boolean> =
objectFactory.property(kotlin.Boolean::class.java).convention(false)
@@ -27,6 +30,7 @@ internal abstract class KotlinCommonCompilerOptionsDefault @javax.inject.Inject
args.apiVersion = apiVersion.orNull?.version
args.languageVersion = languageVersion.orNull?.version
args.optIn = optIn.get().toTypedArray()
args.progressiveMode = progressiveMode.get()
args.useK2 = useK2.get()
}
@@ -35,6 +39,7 @@ internal abstract class KotlinCommonCompilerOptionsDefault @javax.inject.Inject
args.apiVersion = null
args.languageVersion = null
args.optIn = emptyList<String>().toTypedArray()
args.progressiveMode = false
args.useK2 = false
}
}
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt
+1 -4
View File
@@ -106,13 +106,10 @@ internal fun applyLanguageSettingsToCompilerOptions(
) = with(compilerOptions) {
languageVersion.convention(languageSettingsBuilder.languageVersion?.let { KotlinVersion.fromVersion(it) })
apiVersion.convention(languageSettingsBuilder.apiVersion?.let { KotlinVersion.fromVersion(it) })
progressiveMode.convention(languageSettingsBuilder.progressiveMode)
optIn.addAll(languageSettingsBuilder.optInAnnotationsInUse)
val freeArgs = mutableListOf<String>().apply {
if (languageSettingsBuilder.progressiveMode) {
add("-progressive")
}
languageSettingsBuilder.enabledLanguageFeatures.forEach { featureName ->
add("-XXLanguage:+$featureName")
}
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeCompilerArgBuilder.kt
+1 -1
View File
@@ -178,7 +178,6 @@ internal fun buildKotlinNativeCompileCommonArgs(
}
languageSettings.run {
addKey("-progressive", progressiveMode)
enabledLanguageFeatures.forEach { add("-XXLanguage:+$it") }
}
@@ -187,6 +186,7 @@ internal fun buildKotlinNativeCompileCommonArgs(
addKey("-Werror", compilerOptions.allWarningsAsErrors.get())
addKey("-nowarn", compilerOptions.suppressWarnings.get())
addKey("-verbose", compilerOptions.verbose.get())
addKey("-progressive", compilerOptions.progressiveMode.get())
compilerOptions.optIn.get().forEach { add("-opt-in=$it") }
addAll(compilerOptions.freeCompilerArgs.get())
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+3 -1
View File
@@ -197,7 +197,9 @@ abstract class AbstractKotlinNativeCompile<
compilation.languageSettings
}
@get:Input
@Suppress("DeprecatedCallableAddReplaceWith")
@get:Deprecated("Replaced with 'compilerOptions.progressiveMode'")
@get:Internal
val progressiveMode: Boolean
get() = languageSettings.progressiveMode
// endregion.