From daf14d09313f01e2b31e1230f4c4a0070ed4db03 Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Mon, 26 Sep 2022 01:07:18 +0200 Subject: [PATCH] [Gradle, K/N] Deprecate endorsed libraries #KT-54177 Fixed --- .../org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt | 1 + .../plugin/mpp/pm20/GradleKpmNativeVariantCompilationData.kt | 2 ++ .../gradle/plugin/mpp/pm20/GradleKpmNativeVariantInternal.kt | 3 +++ .../gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt | 3 ++- .../kotlin/gradle/targets/native/KotlinNativeCompilation.kt | 1 + .../kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt | 5 ++++- .../kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt | 1 + .../native/tasks/artifact/KotlinNativeLinkArtifactTask.kt | 3 +++ 8 files changed, 17 insertions(+), 2 deletions(-) diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt index 2ee4c9713ac..c7e87ac3bd4 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt @@ -164,6 +164,7 @@ abstract class BenchmarkingPlugin: Plugin { kotlin.targetFromPreset(hostPreset, NATIVE_TARGET_NAME) { @Suppress("DEPRECATION") compilations.getByName("main").kotlinOptions.freeCompilerArgs = benchmark.compilerOpts + project.compilerArgs + @Suppress("DEPRECATION") // enableEndorsedLibs is scheduled to be removed in 1.9.0, see KT-54098 compilations.getByName("main").enableEndorsedLibs = true configureNativeOutput(this@configureNativeTarget) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantCompilationData.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantCompilationData.kt index d49d19dea4c..be0698edc09 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantCompilationData.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantCompilationData.kt @@ -18,6 +18,8 @@ internal class GradleKpmNativeVariantCompilationData( override val konanTarget: KonanTarget get() = variant.konanTarget + @Suppress("DEPRECATION", "DeprecatedCallableAddReplaceWith") + @Deprecated("Declare dependencies explicitly please. This option is scheduled to be removed in 1.9.0") override val enableEndorsedLibs: Boolean get() = variant.enableEndorsedLibraries diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantInternal.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantInternal.kt index 60e074b3ef2..e09b4f038dc 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantInternal.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantInternal.kt @@ -29,6 +29,7 @@ abstract class GradleKpmNativeVariantInternal( ), GradleKpmSingleMavenPublishedModuleHolder by GradleKpmDefaultSingleMavenPublishedModuleHolder(containingModule, fragmentName) { + @Deprecated("Declare dependencies explicitly please. This option is scheduled to be removed in 1.9.0") override var enableEndorsedLibraries: Boolean = false override val gradleVariantNames: Set @@ -43,6 +44,8 @@ abstract class GradleKpmNativeVariantInternal( interface KotlinNativeCompilationData : KotlinCompilationData { val konanTarget: KonanTarget + + @Deprecated("Declare dependencies explicitly please. This option is scheduled to be removed in 1.9.0") val enableEndorsedLibs: Boolean } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt index 16291bfcdce..f00539d3791 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt @@ -198,7 +198,8 @@ internal open class KotlinNativeFragmentMetadataCompilationDataImpl( ?: HostManager.host } - // FIXME endorsed libs? + @Suppress("DeprecatedCallableAddReplaceWith") + @Deprecated("Declare dependencies explicitly please. This option is scheduled to be removed in 1.9.0") override val enableEndorsedLibs: Boolean get() = false } 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 c2744941ede..498071afcce 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 @@ -48,6 +48,7 @@ abstract class AbstractKotlinNativeCompilation( get() = project.nativeUseEmbeddableCompilerJar // Endorsed library controller. + @Deprecated("Declare dependencies explicitly please. This option is scheduled to be removed in 1.9.0") override var enableEndorsedLibs: Boolean = false } 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 78162be38a2..52a5562fd77 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 @@ -278,7 +278,8 @@ constructor( objectFactory.property(it.file(filename).asFile) } - @Suppress("DEPRECATION") + @Suppress("DEPRECATION", "DeprecatedCallableAddReplaceWith") + @Deprecated("Declare dependencies explicitly please. This option is scheduled to be removed in 1.9.0") @get:Input val enableEndorsedLibs: Boolean get() = compilation.enableEndorsedLibs @@ -315,6 +316,8 @@ constructor( konanPropertiesService = konanPropertiesService.get() ).buildCompilerArgs(resolvedDependencyGraph) + @Suppress("DEPRECATION") val enableEndorsedLibs = this.enableEndorsedLibs // TODO: remove before 1.9.0, see KT-54098 + val buildArgs = buildKotlinNativeBinaryLinkerArgs( output, optimized, 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 3179c4e6b6a..2be86cd34d1 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 @@ -208,6 +208,7 @@ abstract class AbstractKotlinNativeCompile< get() = languageSettings.progressiveMode // endregion. + @Deprecated("Declare dependencies explicitly please. This option is scheduled to be removed in 1.9.0") @get:Input val enableEndorsedLibs: Boolean by project.provider { compilation.enableEndorsedLibs } 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 b8a2f66b857..72de4ddfb4e 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 @@ -63,6 +63,7 @@ open class KotlinNativeLinkArtifactTask @Inject constructor( @get:Input var debuggable: Boolean = true + @Deprecated("Declare dependencies explicitly please. This option is scheduled to be removed in 1.9.0") @get:Input var enableEndorsedLibs: Boolean = false @@ -202,6 +203,8 @@ open class KotlinNativeLinkArtifactTask @Inject constructor( val localBinaryOptions = nativeBinaryOptions + binaryOptions + @Suppress("DEPRECATION") val enableEndorsedLibs = this.enableEndorsedLibs // TODO: remove before 1.9.0, see KT-54098 + val buildArgs = buildKotlinNativeBinaryLinkerArgs( outFile = outFile, optimized = optimized,