From bdad2e5c88eda34c7b2cb36204fb0c36213d4b84 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Wed, 10 May 2023 23:16:02 +0200 Subject: [PATCH] [Gradle] Fix Kotlin native compilation exposed compiler options type ^KT-57815 Fixed --- .../kotlin/gradle/targets/native/KotlinNativeCompilation.kt | 6 ++++++ .../kotlin/gradle/targets/native/NativeCompilerOptions.kt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt index 59ca7a4e465..29f143083c3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt @@ -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 get() = compilation.compileTaskProvider as TaskProvider + @Suppress("UNCHECKED_CAST") + override val compilerOptions: HasCompilerOptions + get() = compilation.compilerOptions as HasCompilerOptions + internal val useGenericPluginArtifact: Boolean get() = project.nativeUseEmbeddableCompilerJar diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeCompilerOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeCompilerOptions.kt index 7ee3ffd3266..0b90bb34823 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeCompilerOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeCompilerOptions.kt @@ -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 { +class NativeCompilerOptions(project: Project) : HasCompilerOptions { override val options: KotlinNativeCompilerOptions = project.objects .newInstance(KotlinNativeCompilerOptionsDefault::class.java)