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

[Gradle][Minor] Move castKotlinOptionsType and castCompilerOptionsType into kotlinCompilations.kt

Browse Source 
^KT-54312 Verification Pending
This commit is contained in:
Sebastian Sellmair
2022-10-24 13:28:49 +02:00
committed by Space Team
parent bb2a52a10c
commit 7b377538b1
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt
+15
View File
@@ -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>
}
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilation.kt
-14
View File
@@ -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>
}