From 7b377538b1c0a53ee29af3426cdcfc72b24937ab Mon Sep 17 00:00:00 2001
From: Sebastian Sellmair <sebastian.sellmair@jetbrains.com>
Date: Mon, 24 Oct 2022 13:28:49 +0200
Subject: [PATCH] [Gradle][Minor] Move castKotlinOptionsType and
 castCompilerOptionsType into kotlinCompilations.kt

^KT-54312 Verification Pending
---
 .../gradle/plugin/mpp/kotlinCompilations.kt       | 15 +++++++++++++++
 .../gradle/targets/jvm/KotlinJvmCompilation.kt    | 14 --------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt
index 306c4cc5e12..216a804a360 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt
@@ -6,6 +6,9 @@
 package org.jetbrains.kotlin.gradle.plugin.mpp
 
 import org.gradle.api.Project
+import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions
+import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
+import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
 import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
 import org.jetbrains.kotlin.gradle.utils.fileExtensionCasePermutations
@@ -75,3 +78,15 @@ private val invalidModuleNameCharactersRegex = """[\\/\r\n\t]""".toRegex()
 
 internal fun filterModuleName(moduleName: String): String =
     moduleName.replace(invalidModuleNameCharactersRegex, "_")
+
+internal inline fun <reified T : KotlinCommonOptions> InternalKotlinCompilation<*>.castKotlinOptionsType(): InternalKotlinCompilation<T> {
+    this.kotlinOptions as T
+    @Suppress("UNCHECKED_CAST")
+    return this as InternalKotlinCompilation<T>
+}
+
+internal inline fun <reified T : KotlinCommonCompilerOptions> HasCompilerOptions<*>.castCompilerOptionsType(): HasCompilerOptions<T> {
+    this.options as T
+    @Suppress("UNCHECKED_CAST")
+    return this as HasCompilerOptions<T>
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilation.kt
index 13059907ae0..e14ff63ac21 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilation.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilation.kt
@@ -55,17 +55,3 @@ open class KotlinJvmCompilation @Inject internal constructor(
     override val processResourcesTaskName: String
         get() = compilation.processResourcesTaskName ?: error("Missing 'processResourcesTaskName'")
 }
-
-//TODO SEB: Find a good spot for this function
-internal inline fun <reified T : KotlinCommonOptions> InternalKotlinCompilation<*>.castKotlinOptionsType(): InternalKotlinCompilation<T> {
-    this.kotlinOptions as T
-    @Suppress("UNCHECKED_CAST")
-    return this as InternalKotlinCompilation<T>
-}
-
-//TODO SEB: Find home for function
-internal inline fun <reified T : KotlinCommonCompilerOptions> HasCompilerOptions<*>.castCompilerOptionsType(): HasCompilerOptions<T> {
-    this.options as T
-    @Suppress("UNCHECKED_CAST")
-    return this as HasCompilerOptions<T>
-}