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

[Gradle] Deprecate kotlinOptions in KotlinNativeLink task

Browse Source 
^KT-63419 In Progress
This commit is contained in:
Yahor Berdnikau
2024-02-23 22:21:05 +01:00
committed by Space Team
parent 6e874340e9
commit 6719a437f7
2 changed files with 12 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/NativeBinaries.kt
+1
View File
@@ -84,6 +84,7 @@ sealed class NativeBinary(
} }
/** Additional arguments passed to the Kotlin/Native compiler. */ /** Additional arguments passed to the Kotlin/Native compiler. */
@Suppress("DEPRECATION")
var freeCompilerArgs: List<String> var freeCompilerArgs: List<String>
get() = linkTask.kotlinOptions.freeCompilerArgs get() = linkTask.kotlinOptions.freeCompilerArgs
set(value) { set(value) {
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt
+11 -1
View File
@@ -6,6 +6,7 @@
@file:Suppress("PackageDirectoryMismatch") // Old package for compatibility @file:Suppress("PackageDirectoryMismatch") // Old package for compatibility
package org.jetbrains.kotlin.gradle.tasks package org.jetbrains.kotlin.gradle.tasks
import org.gradle.api.Action
import org.gradle.api.artifacts.component.ModuleComponentIdentifier import org.gradle.api.artifacts.component.ModuleComponentIdentifier
import org.gradle.api.artifacts.component.ProjectComponentIdentifier import org.gradle.api.artifacts.component.ProjectComponentIdentifier
import org.gradle.api.artifacts.result.ResolvedDependencyResult import org.gradle.api.artifacts.result.ResolvedDependencyResult
@@ -128,16 +129,25 @@ constructor(
val additionalCompilerOptions: Provider<Collection<String>> = toolOptions.freeCompilerArgs as Provider<Collection<String>> val additionalCompilerOptions: Provider<Collection<String>> = toolOptions.freeCompilerArgs as Provider<Collection<String>>
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
@Deprecated(KOTLIN_OPTIONS_AS_TOOLS_DEPRECATION_MESSAGE)
@get:Internal @get:Internal
val kotlinOptions: KotlinCommonToolOptions = object : KotlinCommonToolOptions { val kotlinOptions: KotlinCommonToolOptions = object : KotlinCommonToolOptions {
override val options: KotlinCommonCompilerToolOptions override val options: KotlinCommonCompilerToolOptions
get() = toolOptions 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() kotlinOptions.fn()
} }
@Deprecated(KOTLIN_OPTIONS_AS_TOOLS_DEPRECATION_MESSAGE)
@Suppress("DEPRECATION")
fun kotlinOptions(fn: Action<KotlinCommonToolOptions>) {
fn.execute(kotlinOptions)
}
// Binary-specific options. // Binary-specific options.
private val _entryPoint: String by lazyConvention { (binary as? Executable)?.entryPoint.orEmpty() } private val _entryPoint: String by lazyConvention { (binary as? Executable)?.entryPoint.orEmpty() }