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

Gradle, native: Pass --progressive to both compile and link tasks

Browse Source
This commit is contained in:
Ilya Matveev
2019-09-05 18:22:21 +07:00
parent 90358dee55
commit 20332ae231
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+9 -8
View File
@@ -124,12 +124,19 @@ abstract class AbstractKotlinNativeCompile<T : KotlinCommonToolOptions> : Abstra
val additionalCompilerOptions: Collection<String>
@Input get() = kotlinOptions.freeCompilerArgs
// region DSL for compiler options
// region Compiler options.
@get:Internal
abstract val kotlinOptions: T
abstract fun kotlinOptions(fn: T.() -> Unit)
abstract fun kotlinOptions(fn: Closure<*>)
@get:Internal
val languageSettings: LanguageSettingsBuilder?
get() = project.kotlinExtension.sourceSets.findByName(compilation.defaultSourceSetName)?.languageSettings
@get:Input
val progressiveMode: Boolean
get() = languageSettings?.progressiveMode ?: false
// endregion.
val kotlinNativeVersion: String
@@ -193,6 +200,7 @@ abstract class AbstractKotlinNativeCompile<T : KotlinCommonToolOptions> : Abstra
addKey("-Werror", kotlinOptions.allWarningsAsErrors)
addKey("-nowarn", kotlinOptions.suppressWarnings)
addKey("-verbose", kotlinOptions.verbose)
addKey("-progressive", progressiveMode)
if (!defaultsOnly) {
addAll(additionalCompilerOptions)
@@ -266,18 +274,12 @@ open class KotlinNativeCompile : AbstractKotlinNativeCompile<KotlinCommonOptions
// endregion.
// region Language settings imported from a SourceSet.
val languageSettings: LanguageSettingsBuilder?
@Internal get() = project.kotlinExtension.sourceSets.findByName(compilation.defaultSourceSetName)?.languageSettings
val languageVersion: String?
@Optional @Input get() = languageSettings?.languageVersion
val apiVersion: String?
@Optional @Input get() = languageSettings?.apiVersion
val progressiveMode: Boolean
@Input get() = languageSettings?.progressiveMode ?: false
val enabledLanguageFeatures: Set<String>
@Input get() = languageSettings?.enabledLanguageFeatures ?: emptySet()
@@ -327,7 +329,6 @@ open class KotlinNativeCompile : AbstractKotlinNativeCompile<KotlinCommonOptions
// Language features.
addArgIfNotNull("-language-version", languageVersion)
addArgIfNotNull("-api-version", apiVersion)
addKey("-progressive", progressiveMode)
enabledLanguageFeatures.forEach { featureName ->
add("-XXLanguage:+$featureName")
}