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

[Gradle] Fix Kotlin native compilation exposed compiler options type

Browse Source 
^KT-57815 Fixed
This commit is contained in:
Yahor Berdnikau
2023-05-10 23:16:02 +02:00
committed by Space Team
parent cc9325eb5b
commit bdad2e5c88
2 changed files with 7 additions and 1 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/targets/native/KotlinNativeCompilation.kt
+6
View File
@@ -11,6 +11,8 @@ import org.gradle.api.NamedDomainObjectContainer
import org.gradle.api.Project
import org.gradle.api.tasks.TaskProvider
import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
import org.jetbrains.kotlin.gradle.dsl.KotlinNativeCompilerOptions
import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions
import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.KotlinCompilationImpl
import org.jetbrains.kotlin.gradle.targets.native.NativeCompilerOptions
@@ -38,6 +40,10 @@ abstract class AbstractKotlinNativeCompilation internal constructor(
override val compileTaskProvider: TaskProvider<KotlinNativeCompile>
get() = compilation.compileTaskProvider as TaskProvider<KotlinNativeCompile>
@Suppress("UNCHECKED_CAST")
override val compilerOptions: HasCompilerOptions<KotlinNativeCompilerOptions>
get() = compilation.compilerOptions as HasCompilerOptions<KotlinNativeCompilerOptions>
internal val useGenericPluginArtifact: Boolean
get() = project.nativeUseEmbeddableCompilerJar
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeCompilerOptions.kt
+1 -1
View File
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.gradle.plugin.sources.applyLanguageSettingsToCompile
import org.jetbrains.kotlin.gradle.utils.configureExperimentalTryK2
import org.jetbrains.kotlin.project.model.LanguageSettings
class NativeCompilerOptions(project: Project) : HasCompilerOptions<KotlinCommonCompilerOptions> {
class NativeCompilerOptions(project: Project) : HasCompilerOptions<KotlinNativeCompilerOptions> {
override val options: KotlinNativeCompilerOptions = project.objects
.newInstance(KotlinNativeCompilerOptionsDefault::class.java)