From 11e0edc1243235cd59323fbda634068b5ea3f5bb Mon Sep 17 00:00:00 2001
From: "Alexander.Likhachev" <Alexander.Likhachev@jetbrains.com>
Date: Mon, 13 Nov 2023 23:01:01 +0100
Subject: [PATCH] [Gradle, K/N] Remove the `enableEndorsedLibs` flag

This is the last stage of the flag's deprecation cycle.
^KT-56455 Fixed
---
 .../gradle/targets/native/KotlinNativeCompilation.kt     | 8 --------
 .../gradle/targets/native/tasks/KotlinNativeLink.kt      | 9 ---------
 .../gradle/targets/native/tasks/KotlinNativeTasks.kt     | 9 ---------
 .../tasks/artifact/KotlinNativeLinkArtifactTask.kt       | 9 ---------
 4 files changed, 35 deletions(-)

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 82f87893bf4..457d3b70ab9 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
@@ -54,14 +54,6 @@ abstract class AbstractKotlinNativeCompilation internal constructor(
 
     internal val useGenericPluginArtifact: Boolean
         get() = project.nativeUseEmbeddableCompilerJar
-
-    // Endorsed library controller.
-    @Suppress("unused")
-    @Deprecated(
-        "Please declare explicit dependency on kotlinx-cli. This option has no longer effect since 1.9.0",
-        level = DeprecationLevel.ERROR
-    )
-    var enableEndorsedLibs: Boolean = false
 }
 
 open class KotlinNativeCompilation @Inject internal constructor(
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 6f1a895fe5c..1e4a6318872 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
@@ -329,15 +329,6 @@ constructor(
             objectFactory.property(it.file(filename).asFile)
         }
 
-    @Suppress("unused", "DeprecatedCallableAddReplaceWith")
-    @Deprecated(
-        "Please declare explicit dependency on kotlinx-cli. This option has no longer effect since 1.9.0",
-        level = DeprecationLevel.ERROR
-    )
-    @get:Input
-    val enableEndorsedLibs: Boolean
-        get() = false
-
     @Internal
     val compilerPluginOptions = CompilerPluginOptions()
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
index 06cb855d337..7be24842574 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
@@ -217,15 +217,6 @@ abstract class AbstractKotlinNativeCompile<
         get() = compilation.compilerOptions.options.progressiveMode.get()
     // endregion.
 
-    @Suppress("DeprecatedCallableAddReplaceWith")
-    @Deprecated(
-        "Please declare explicit dependency on kotlinx-cli. This option has no longer effect since 1.9.0",
-        level = DeprecationLevel.ERROR
-    )
-    @get:Input
-    val enableEndorsedLibs: Boolean
-        get() = false
-
     @get:Input
     val kotlinNativeVersion: String = project.konanVersion
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLinkArtifactTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLinkArtifactTask.kt
index 17921d72fb9..be44d667777 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLinkArtifactTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLinkArtifactTask.kt
@@ -69,13 +69,6 @@ abstract class KotlinNativeLinkArtifactTask @Inject constructor(
     @get:Input
     abstract val debuggable: Property<Boolean>
 
-    @Deprecated(
-        "Please declare explicit dependency on kotlinx-cli. This option has no longer effect since 1.9.0",
-        level = DeprecationLevel.ERROR
-    )
-    @get:Input
-    abstract val enableEndorsedLibs: Property<Boolean>
-
     @get:Input
     abstract val processTests: Property<Boolean>
 
@@ -189,8 +182,6 @@ abstract class KotlinNativeLinkArtifactTask @Inject constructor(
         baseName.convention(project.name)
         debuggable.convention(true)
         optimized.convention(false)
-        @Suppress("DEPRECATION_ERROR")
-        enableEndorsedLibs.value(false).finalizeValue()
         processTests.convention(false)
         staticFramework.convention(false)
         destinationDir.convention(debuggable.flatMap {