Minor fix: handle kotlinOptions more carefully, store them where needed
This commit is contained in:
-3
@@ -281,9 +281,6 @@ abstract class AbstractKotlinCompilation<T : KotlinCommonOptions>(
|
|||||||
override val associateWith: List<KotlinCompilation<*>>
|
override val associateWith: List<KotlinCompilation<*>>
|
||||||
get() = Collections.unmodifiableList(_associateWith.toList())
|
get() = Collections.unmodifiableList(_associateWith.toList())
|
||||||
|
|
||||||
override val kotlinOptions: T
|
|
||||||
get() = TODO("Not yet implemented")
|
|
||||||
|
|
||||||
override val project: Project
|
override val project: Project
|
||||||
get() = target.project
|
get() = target.project
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -23,8 +23,7 @@ class KotlinJvmVariantCompilationData(val variant: KotlinJvmVariant) : KotlinVar
|
|||||||
override val owner: KotlinJvmVariant get() = variant
|
override val owner: KotlinJvmVariant get() = variant
|
||||||
|
|
||||||
// TODO pull out to the variant
|
// TODO pull out to the variant
|
||||||
override val kotlinOptions: KotlinJvmOptions
|
override val kotlinOptions: KotlinJvmOptions = KotlinJvmOptionsImpl()
|
||||||
get() = KotlinJvmOptionsImpl()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
internal fun KotlinGradleVariant.ownModuleName(): String {
|
internal fun KotlinGradleVariant.ownModuleName(): String {
|
||||||
|
|||||||
+1
-2
@@ -150,8 +150,7 @@ internal open class KotlinNativeFragmentMetadataCompilationDataImpl(
|
|||||||
override val isActive: Boolean
|
override val isActive: Boolean
|
||||||
get() = fragment.isNativeShared()
|
get() = fragment.isNativeShared()
|
||||||
|
|
||||||
override val kotlinOptions: NativeCompileOptions
|
override val kotlinOptions: NativeCompileOptions = NativeCompileOptions { languageSettings }
|
||||||
get() = NativeCompileOptions { languageSettings }
|
|
||||||
|
|
||||||
override val konanTarget: KonanTarget
|
override val konanTarget: KonanTarget
|
||||||
get() {
|
get() {
|
||||||
|
|||||||
Reference in New Issue
Block a user