diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/GradleProjectModuleBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/GradleProjectModuleBuilder.kt index 40972bd36e6..73b4c939f6a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/GradleProjectModuleBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/GradleProjectModuleBuilder.kt @@ -33,11 +33,11 @@ class ProjectStructureMetadataModuleBuilder { ): KotlinModule { val moduleData = BasicKotlinModule(component.toSingleModuleIdentifier()).apply { metadata.sourceSetNamesByVariantName.keys.forEach { variantName -> - fragments.add(BasicKotlinModuleVariant(this@apply, variantName, DefaultLanguageSettingsBuilder())) + fragments.add(BasicKotlinModuleVariant(this@apply, variantName)) } fun fragment(sourceSetName: String): BasicKotlinModuleFragment { if (fragments.none { it.fragmentName == sourceSetName }) - fragments.add(BasicKotlinModuleFragment(this@apply, sourceSetName, DefaultLanguageSettingsBuilder())) + fragments.add(BasicKotlinModuleFragment(this@apply, sourceSetName)) return fragmentByName(sourceSetName) } metadata.sourceSetNamesByVariantName.forEach { (variantName, sourceSets) -> diff --git a/libraries/tools/kotlin-project-model/src/main/kotlin/KotlinModuleFragment.kt b/libraries/tools/kotlin-project-model/src/main/kotlin/KotlinModuleFragment.kt index 1250ab869fa..8c3d8a86ffb 100644 --- a/libraries/tools/kotlin-project-model/src/main/kotlin/KotlinModuleFragment.kt +++ b/libraries/tools/kotlin-project-model/src/main/kotlin/KotlinModuleFragment.kt @@ -14,7 +14,7 @@ interface KotlinModuleFragment { val fragmentName: String val directRefinesDependencies: Iterable - val languageSettings: LanguageSettings + val languageSettings: LanguageSettings? // TODO: scopes val declaredModuleDependencies: Iterable @@ -49,7 +49,7 @@ val KotlinModuleFragment.refinesClosure: Set open class BasicKotlinModuleFragment( override val containingModule: KotlinModule, override val fragmentName: String, - override val languageSettings: LanguageSettings + override val languageSettings: LanguageSettings? = null ) : KotlinModuleFragment { override val directRefinesDependencies: MutableSet = mutableSetOf() @@ -63,7 +63,7 @@ open class BasicKotlinModuleFragment( class BasicKotlinModuleVariant( containingModule: KotlinModule, fragmentName: String, - languageSettings: LanguageSettings + languageSettings: LanguageSettings? = null ) : BasicKotlinModuleFragment ( containingModule, fragmentName,