Kotlin 2.2 migration: Removed methods that were deprecated with error level and are now removed from KGP

tbogdanova · tbogdanova · commit 6ff3fbc64c7d · 2025-05-15T14:56:02.000+02:00
KT-64517, KT-71608
diff --git a/build-logic/src/main/kotlin/ktorbuild/internal/TrackedKotlinHierarchy.kt b/build-logic/src/main/kotlin/ktorbuild/internal/TrackedKotlinHierarchy.kt
@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
 import org.jetbrains.kotlin.gradle.plugin.KotlinHierarchyBuilder
 import org.jetbrains.kotlin.gradle.plugin.KotlinHierarchyTemplate
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
-import org.jetbrains.kotlin.konan.target.REMOVED_TARGET_MESSAGE
 
 private typealias GroupedSourceSets = MutableMap<String, MutableSet<String>>
 
@@ -122,7 +121,6 @@ private class KotlinHierarchyTrackerImpl(
     override fun withWasmWasi() = addTarget("wasmWasi")
 
     @Deprecated("Renamed to 'withAndroidTarget'", replaceWith = ReplaceWith("withAndroidTarget()"))
-    override fun withAndroid() = withAndroidTarget()
     override fun withAndroidTarget() = addTarget("android")
     override fun withAndroidNativeX64() = addTarget("androidNativeX64")
     override fun withAndroidNativeX86() = addTarget("androidNativeX86")
@@ -148,29 +146,6 @@ private class KotlinHierarchyTrackerImpl(
     override fun withMingwX64() = addTarget("mingwX64")
     //endregion
 
-    //region Removed targets
-    @Deprecated(REMOVED_TARGET_MESSAGE, level = DeprecationLevel.ERROR)
-    override fun withIosArm32() = error("Target removed")
-
-    @Deprecated(REMOVED_TARGET_MESSAGE, level = DeprecationLevel.ERROR)
-    override fun withWatchosX86() = error("Target removed")
-
-    @Deprecated(REMOVED_TARGET_MESSAGE, level = DeprecationLevel.ERROR)
-    override fun withMingwX86() = error("Target removed")
-
-    @Deprecated(REMOVED_TARGET_MESSAGE, level = DeprecationLevel.ERROR)
-    override fun withLinuxArm32Hfp() = error("Target removed")
-
-    @Deprecated(REMOVED_TARGET_MESSAGE, level = DeprecationLevel.ERROR)
-    override fun withLinuxMips32() = error("Target removed")
-
-    @Deprecated(REMOVED_TARGET_MESSAGE, level = DeprecationLevel.ERROR)
-    override fun withLinuxMipsel32() = error("Target removed")
-
-    @Deprecated(REMOVED_TARGET_MESSAGE, level = DeprecationLevel.ERROR)
-    override fun withWasm32() = error("Target removed")
-    //endregion
-
     private fun addTarget(name: String) {
         if (groupName == null) return
         check(!targetsFrozen) { "Can't add targets to already declared group: $groupName" }
