[KT-77486] refactor: remove deprecated Bitcode DSL from repository
diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinArtifact.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinArtifact.kt
index 615106a..7dba012 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinArtifact.kt
+++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinArtifact.kt
@@ -10,7 +10,6 @@
import org.gradle.api.plugins.ExtensionAware
import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.KotlinArtifactsExtension.Companion.KOTLIN_NATIVE_ARTIFACTS_DEPRECATION
-import org.jetbrains.kotlin.gradle.plugin.mpp.BITCODE_EMBEDDING_DEPRECATION_MESSAGE
import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
import org.jetbrains.kotlin.konan.target.KonanTarget
@@ -58,11 +57,6 @@
@Deprecated(KotlinArtifactsExtension.KOTLIN_NATIVE_ARTIFACTS_DEPRECATION)
interface KotlinNativeFramework : KotlinNativeArtifact {
val target: KonanTarget
-
- @OptIn(InternalKotlinGradlePluginApi::class)
- @Suppress("DEPRECATION_ERROR")
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
- val embedBitcode: org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode?
}
/**
@@ -71,11 +65,6 @@
@Deprecated(KotlinArtifactsExtension.KOTLIN_NATIVE_ARTIFACTS_DEPRECATION)
interface KotlinNativeFatFramework : KotlinNativeArtifact {
val targets: Set<KonanTarget>
-
- @OptIn(InternalKotlinGradlePluginApi::class)
- @Suppress("DEPRECATION_ERROR")
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
- val embedBitcode: org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode?
}
/**
@@ -84,11 +73,6 @@
@Deprecated(KotlinArtifactsExtension.KOTLIN_NATIVE_ARTIFACTS_DEPRECATION)
interface KotlinNativeXCFramework : KotlinNativeArtifact {
val targets: Set<KonanTarget>
-
- @OptIn(InternalKotlinGradlePluginApi::class)
- @Suppress("DEPRECATION_ERROR")
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
- val embedBitcode: org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode?
}
/**
@@ -136,11 +120,6 @@
@Deprecated(KotlinArtifactsExtension.KOTLIN_NATIVE_ARTIFACTS_DEPRECATION)
interface KotlinNativeFrameworkConfig : KotlinNativeArtifactConfig {
var target: KonanTarget
-
- @OptIn(InternalKotlinGradlePluginApi::class)
- @Suppress("DEPRECATION_ERROR")
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
- var embedBitcode: org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode?
}
/**
@@ -150,11 +129,6 @@
interface KotlinNativeFatFrameworkConfig : KotlinNativeArtifactConfig {
var targets: Set<KonanTarget>
fun targets(vararg targets: KonanTarget)
-
- @OptIn(InternalKotlinGradlePluginApi::class)
- @Suppress("DEPRECATION_ERROR")
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
- var embedBitcode: org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode?
}
/**
@@ -164,11 +138,6 @@
interface KotlinNativeXCFrameworkConfig : KotlinNativeArtifactConfig {
var targets: Set<KonanTarget>
fun targets(vararg targets: KonanTarget)
-
- @OptIn(InternalKotlinGradlePluginApi::class)
- @Suppress("DEPRECATION_ERROR")
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
- var embedBitcode: org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode?
}
/**
diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/NativeBinaryTypes.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/NativeBinaryTypes.kt
index b6ab899..9e47153 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/NativeBinaryTypes.kt
+++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/NativeBinaryTypes.kt
@@ -7,7 +7,6 @@
package org.jetbrains.kotlin.gradle.plugin.mpp
import org.gradle.api.Named
-import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi
import org.jetbrains.kotlin.konan.target.CompilerOutputKind
import org.jetbrains.kotlin.konan.target.KonanTarget
import java.util.*
@@ -44,11 +43,6 @@
*/
override fun getName(): String = name.lowercase()
- /** @suppress **/
- @OptIn(InternalKotlinGradlePluginApi::class)
- @Suppress("DEPRECATION_ERROR", "UNUSED_PARAMETER")
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR, replaceWith = ReplaceWith(""))
- fun embedBitcode(target: KonanTarget) = BitcodeEmbeddingMode.DISABLE
/** @suppress **/
companion object {
@@ -136,20 +130,3 @@
* @property BITCODE Bitcode is embedded as part of the binary, allowing later optimization.
* @property MARKER Only a placeholder marker is embedded instead of actual bitcode.
*/
-@OptIn(InternalKotlinGradlePluginApi::class)
-@Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
-enum class BitcodeEmbeddingMode {
- /** Don't embed LLVM IR bitcode. */
- DISABLE,
-
- /** Embed LLVM IR bitcode as data. */
- BITCODE,
-
- /** Embed placeholder LLVM IR data as a marker. */
- MARKER,
-}
-
-/** @suppress **/
-@InternalKotlinGradlePluginApi
-const val BITCODE_EMBEDDING_DEPRECATION_MESSAGE =
- "Bitcode embedding is not supported anymore. Configuring it has no effect. The corresponding DSL parameters will be removed in Kotlin 2.3"
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 d6c48d3..740112e 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
@@ -295,33 +295,6 @@
override val outputKind: NativeOutputKind
get() = NativeOutputKind.FRAMEWORK
- // Embedding bitcode.
- /**
- * Embed bitcode for the framework or not. See [BitcodeEmbeddingMode].
- */
- @Suppress("DEPRECATION_ERROR")
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
- val embedBitcodeMode = project.objects.property(org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode::class.java)
-
- @Suppress("DEPRECATION_ERROR")
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
- var embedBitcode: org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode = org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode.DISABLE
-
- /**
- * Enable or disable embedding bitcode for the framework. See [BitcodeEmbeddingMode].
- */
- @Suppress("DEPRECATION_ERROR")
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR, replaceWith = ReplaceWith(""))
- fun embedBitcode(mode: org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode) {
- embedBitcodeMode.set(mode)
- }
-
- /**
- * [embedBitcode] is deprecated and has no effect
- */
- @Suppress("DEPRECATION_ERROR")
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR, replaceWith = ReplaceWith(""))
- fun embedBitcode(mode: String) = embedBitcode(org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode.valueOf(mode.toUpperCaseAsciiOnly()))
/**
* Specifies if the framework is linked as a static library (false by default).
@@ -334,13 +307,6 @@
@ExperimentalKotlinGradlePluginApi
val exportKdoc: Property<Boolean> = project.objects.property(true)
- @Suppress("DEPRECATION_ERROR")
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
- object BitcodeEmbeddingMode {
- val DISABLE = org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode.DISABLE
- val BITCODE = org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode.BITCODE
- val MARKER = org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode.MARKER
- }
companion object {
val frameworkTargets: Attribute<Set<String>> = attributeOf<Set<String>>(
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 f8c84d6..a1a6925 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
@@ -217,18 +217,6 @@
@get:Input
val target: String = compilation.konanTarget.name
- @Suppress("DEPRECATION_ERROR")
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
- @get:Internal
- val embedBitcode: BitcodeEmbeddingMode
- get() = embedBitcodeMode.get()
-
- @get:Input
- @get:Optional
- @Suppress("DEPRECATION_ERROR")
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
- val embedBitcodeMode: Provider<BitcodeEmbeddingMode> = objectFactory.property()
-
@get:Internal
val apiFiles: ConfigurableFileCollection = objectFactory.fileCollection()
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinArtifactsExtensionImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinArtifactsExtensionImpl.kt
index 823c420..dae0a29 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinArtifactsExtensionImpl.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinArtifactsExtensionImpl.kt
@@ -6,7 +6,6 @@
import org.jetbrains.kotlin.gradle.dsl.KotlinArtifact
import org.jetbrains.kotlin.gradle.dsl.KotlinArtifactConfig
import org.jetbrains.kotlin.gradle.dsl.KotlinArtifactsExtension
-import org.jetbrains.kotlin.gradle.plugin.mpp.BITCODE_EMBEDDING_DEPRECATION_MESSAGE
import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
import org.jetbrains.kotlin.konan.target.DEPRECATED_TARGET_MESSAGE
import org.jetbrains.kotlin.konan.target.KonanTarget
@@ -21,18 +20,6 @@
val RELEASE = NativeBuildType.RELEASE
val DEBUG = NativeBuildType.DEBUG
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
- @Suppress("DEPRECATION_ERROR")
- class BitcodeEmbeddingModeDsl {
- val DISABLE = org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode.DISABLE
- val BITCODE = org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode.BITCODE
- val MARKER = org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode.MARKER
- }
-
- @Suppress("DEPRECATION_ERROR")
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
- @JvmField
- val EmbedBitcodeMode = BitcodeEmbeddingModeDsl()
val androidX64 = KonanTarget.ANDROID_X64
val androidX86 = KonanTarget.ANDROID_X86
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeFatFramework.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeFatFramework.kt
index dca6e9d..8d67cff 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeFatFramework.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeFatFramework.kt
@@ -31,10 +31,6 @@
this.targets = targets.toSet()
}
- @Suppress("DEPRECATION_ERROR")
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
- override var embedBitcode: org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode? = null
-
override fun validate() {
super.validate()
val kind = NativeOutputKind.FRAMEWORK
@@ -80,9 +76,6 @@
override val toolOptionsConfigure: KotlinCommonCompilerToolOptions.() -> Unit,
override val binaryOptions: Map<String, String>,
override val targets: Set<KonanTarget>,
- @Suppress("DEPRECATION_ERROR")
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
- override val embedBitcode: org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode? = null,
extensions: ExtensionAware
) : KotlinNativeFatFramework, ExtensionAware by extensions {
override fun getName() = lowerCamelCaseName(artifactName, "FatFramework")
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 6243679..2733daa 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
@@ -29,7 +29,6 @@
import org.jetbrains.kotlin.gradle.internal.ensureParentDirsCreated
import org.jetbrains.kotlin.gradle.internal.properties.nativeProperties
import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider
-import org.jetbrains.kotlin.gradle.plugin.mpp.BITCODE_EMBEDDING_DEPRECATION_MESSAGE
import org.jetbrains.kotlin.gradle.plugin.mpp.apple.useXcodeMessageStyle
import org.jetbrains.kotlin.gradle.plugin.statistics.UsesBuildFusService
import org.jetbrains.kotlin.gradle.report.GradleBuildMetricsReporter
@@ -89,11 +88,6 @@
@get:Input
abstract val staticFramework: Property<Boolean>
- @get:Input
- @get:Optional
- @Suppress("DEPRECATION_ERROR")
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
- abstract val embedBitcode: Property<org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode>
@get:Classpath
abstract val libraries: ConfigurableFileCollection
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeXCFramework.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeXCFramework.kt
index 1ebb5c4..5f810d8 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeXCFramework.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeXCFramework.kt
@@ -30,10 +30,6 @@
this.targets = targets.toSet()
}
- @Suppress("DEPRECATION_ERROR")
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
- override var embedBitcode: org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode? = null
-
override fun validate() {
super.validate()
val kind = NativeOutputKind.FRAMEWORK
@@ -79,9 +75,6 @@
override val toolOptionsConfigure: KotlinCommonCompilerToolOptions.() -> Unit,
override val binaryOptions: Map<String, String>,
override val targets: Set<KonanTarget>,
- @Suppress("DEPRECATION_ERROR")
- @Deprecated(BITCODE_EMBEDDING_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
- override val embedBitcode: org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode? = null,
extensions: ExtensionAware
) : KotlinNativeXCFramework, ExtensionAware by extensions {
override fun getName() = lowerCamelCaseName(artifactName, "XCFramework")
