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

[Gradle] Deprecate kotlinOptions in KotlinNativeLinkArtifactTask task

Browse Source 
^KT-63419 In Progress
This commit is contained in:
Yahor Berdnikau
2024-02-23 22:25:19 +01:00
committed by Space Team
parent 6719a437f7
commit 48a84e5b79
2 changed files with 8 additions and 6 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/tasks/artifact/KotlinNativeFramework.kt
+1
View File
@@ -126,6 +126,7 @@ internal fun KotlinNativeArtifact.registerLinkFrameworkTask(
} }
task.libraries.setFrom(project.configurations.getByName(librariesConfigurationName)) task.libraries.setFrom(project.configurations.getByName(librariesConfigurationName))
task.exportLibraries.setFrom(project.configurations.getByName(exportConfigurationName)) task.exportLibraries.setFrom(project.configurations.getByName(exportConfigurationName))
@Suppress("DEPRECATION")
task.kotlinOptions(kotlinOptionsFn) task.kotlinOptions(kotlinOptionsFn)
} }
project.tasks.named(LifecycleBasePlugin.ASSEMBLE_TASK_NAME).dependsOn(resultTask) project.tasks.named(LifecycleBasePlugin.ASSEMBLE_TASK_NAME).dependsOn(resultTask)
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLinkArtifactTask.kt
+7 -6
View File
@@ -113,21 +113,22 @@ abstract class KotlinNativeLinkArtifactTask @Inject constructor(
} }
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
@Deprecated(KOTLIN_OPTIONS_AS_TOOLS_DEPRECATION_MESSAGE)
@get:Internal @get:Internal
val kotlinOptions = object : KotlinCommonToolOptions { val kotlinOptions = object : KotlinCommonToolOptions {
override val options: KotlinCommonCompilerToolOptions override val options: KotlinCommonCompilerToolOptions
get() = toolOptions get() = toolOptions
} }
fun kotlinOptions( @Suppress("DEPRECATION")
@Suppress("DEPRECATION") fn: KotlinCommonToolOptions.() -> Unit @Deprecated(KOTLIN_OPTIONS_AS_TOOLS_DEPRECATION_MESSAGE)
) { fun kotlinOptions(fn: KotlinCommonToolOptions.() -> Unit) {
kotlinOptions.fn() kotlinOptions.fn()
} }
fun kotlinOptions( @Suppress("DEPRECATION")
@Suppress("DEPRECATION") fn: Action<KotlinCommonToolOptions> @Deprecated(KOTLIN_OPTIONS_AS_TOOLS_DEPRECATION_MESSAGE)
) { fun kotlinOptions(fn: Action<KotlinCommonToolOptions>) {
fn.execute(kotlinOptions) fn.execute(kotlinOptions)
} }