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

Add immutable LanguageSettings interface and apply it to compilation

Browse Source 
LanguageSettingsBuilder extends LanguageSettings
This commit is contained in:
Anton Lakotka
2021-03-25 09:48:29 +01:00
committed by Sergey Igushkin
parent 54c6ae2cce
commit de4221afd8
11 changed files with 47 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder.kt
+8 -6
View File
@@ -5,18 +5,20 @@
package org.jetbrains.kotlin.gradle.plugin
interface LanguageSettingsBuilder {
var languageVersion: String?
import org.jetbrains.kotlin.project.model.LanguageSettings
var apiVersion: String?
interface LanguageSettingsBuilder : LanguageSettings {
override var languageVersion: String?
var progressiveMode: Boolean
override var apiVersion: String?
override var progressiveMode: Boolean
fun enableLanguageFeature(name: String)
val enabledLanguageFeatures: Set<String>
override val enabledLanguageFeatures: Set<String>
fun useExperimentalAnnotation(name: String)
val experimentalAnnotationsInUse: Set<String>
override val experimentalAnnotationsInUse: Set<String>
}
libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinCompilationData.kt
+3 -3
View File
@@ -11,7 +11,7 @@ import org.gradle.api.file.SourceDirectorySet
import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationOutput
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.LanguageSettingsBuilder
import org.jetbrains.kotlin.project.model.LanguageSettings
interface KotlinCompilationData<T : KotlinCommonOptions> {
val project: Project
@@ -27,7 +27,7 @@ interface KotlinCompilationData<T : KotlinCommonOptions> {
val compileDependencyFiles: FileCollection
val output: KotlinCompilationOutput
val languageSettings: LanguageSettingsBuilder
val languageSettings: LanguageSettings
val platformType: KotlinPlatformType
val moduleName: String
@@ -61,7 +61,7 @@ interface KotlinVariantCompilationData<T : KotlinCommonOptions> : KotlinCompilat
override val compileDependencyFiles: FileCollection
get() = owner.compileDependencyFiles
override val languageSettings: LanguageSettingsBuilder
override val languageSettings: LanguageSettings
get() = owner.languageSettings
override val platformType: KotlinPlatformType
libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt
+1 -4
View File
@@ -22,10 +22,7 @@ interface KotlinGradleFragment : KotlinModuleFragment, HasKotlinDependencies, Na
override fun getName(): String = fragmentName
// TODO pull up to KotlinModuleFragment
// FIXME apply to compilation
// FIXME check for consistency
val languageSettings: LanguageSettingsBuilder
override val languageSettings: LanguageSettingsBuilder
val project: Project
get() = containingModule.project