From 6719a437f7456491d3bbeb2e616a209159d57151 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Fri, 23 Feb 2024 22:21:05 +0100 Subject: [PATCH] [Gradle] Deprecate kotlinOptions in KotlinNativeLink task ^KT-63419 In Progress --- .../kotlin/gradle/targets/native/NativeBinaries.kt | 1 + .../gradle/targets/native/tasks/KotlinNativeLink.kt | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt index 0225c569e4d..52380063c0b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt @@ -84,6 +84,7 @@ sealed class NativeBinary( } /** Additional arguments passed to the Kotlin/Native compiler. */ + @Suppress("DEPRECATION") var freeCompilerArgs: List get() = linkTask.kotlinOptions.freeCompilerArgs set(value) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt index 7cfa29132b4..aea9b312dcb 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt @@ -6,6 +6,7 @@ @file:Suppress("PackageDirectoryMismatch") // Old package for compatibility package org.jetbrains.kotlin.gradle.tasks +import org.gradle.api.Action import org.gradle.api.artifacts.component.ModuleComponentIdentifier import org.gradle.api.artifacts.component.ProjectComponentIdentifier import org.gradle.api.artifacts.result.ResolvedDependencyResult @@ -128,16 +129,25 @@ constructor( val additionalCompilerOptions: Provider> = toolOptions.freeCompilerArgs as Provider> @Suppress("DEPRECATION") + @Deprecated(KOTLIN_OPTIONS_AS_TOOLS_DEPRECATION_MESSAGE) @get:Internal val kotlinOptions: KotlinCommonToolOptions = object : KotlinCommonToolOptions { override val options: KotlinCommonCompilerToolOptions get() = toolOptions } - fun kotlinOptions(@Suppress("DEPRECATION") fn: KotlinCommonToolOptions.() -> Unit) { + @Deprecated(KOTLIN_OPTIONS_AS_TOOLS_DEPRECATION_MESSAGE) + @Suppress("DEPRECATION") + fun kotlinOptions(fn: KotlinCommonToolOptions.() -> Unit) { kotlinOptions.fn() } + @Deprecated(KOTLIN_OPTIONS_AS_TOOLS_DEPRECATION_MESSAGE) + @Suppress("DEPRECATION") + fun kotlinOptions(fn: Action) { + fn.execute(kotlinOptions) + } + // Binary-specific options. private val _entryPoint: String by lazyConvention { (binary as? Executable)?.entryPoint.orEmpty() }