From 2a5d511b667e77a92932f4e7e8f6a36cc2b8ecf6 Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <sergey.igushkin@jetbrains.com>
Date: Thu, 25 Mar 2021 20:30:26 +0300
Subject: [PATCH] Minor fix: handle kotlinOptions more carefully, store them
 where needed

---
 .../jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt   | 3 ---
 .../kotlin/gradle/plugin/mpp/pm20/KotlinJvmVariant.kt          | 3 +--
 .../gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt    | 3 +--
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt
index e504e3d8679..904cb12011d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt
@@ -281,9 +281,6 @@ abstract class AbstractKotlinCompilation<T : KotlinCommonOptions>(
     override val associateWith: List<KotlinCompilation<*>>
         get() = Collections.unmodifiableList(_associateWith.toList())
 
-    override val kotlinOptions: T
-        get() = TODO("Not yet implemented")
-
     override val project: Project
         get() = target.project
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinJvmVariant.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinJvmVariant.kt
index eb3128092be..1d156e298c4 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinJvmVariant.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinJvmVariant.kt
@@ -23,8 +23,7 @@ class KotlinJvmVariantCompilationData(val variant: KotlinJvmVariant) : KotlinVar
     override val owner: KotlinJvmVariant get() = variant
 
     // TODO pull out to the variant
-    override val kotlinOptions: KotlinJvmOptions
-        get() = KotlinJvmOptionsImpl()
+    override val kotlinOptions: KotlinJvmOptions = KotlinJvmOptionsImpl()
 }
 
 internal fun KotlinGradleVariant.ownModuleName(): String {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt
index 915ec9053cf..04157a5b179 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt
@@ -150,8 +150,7 @@ internal open class KotlinNativeFragmentMetadataCompilationDataImpl(
     override val isActive: Boolean
         get() = fragment.isNativeShared()
 
-    override val kotlinOptions: NativeCompileOptions
-        get() = NativeCompileOptions { languageSettings }
+    override val kotlinOptions: NativeCompileOptions = NativeCompileOptions { languageSettings }
 
     override val konanTarget: KonanTarget
         get() {