Fixed k/n it tests after removing deprecated targets iosArm32 and watchosX86

^KT-51553
^KT-56533

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/FatFrameworkIT.kt

@@ -26,7 +26,7 @@ class FatFrameworkIT : KGPBaseTest() {
     fun smokeIos(gradleVersion: GradleVersion) {
         nativeProject("native-fat-framework/smoke", gradleVersion) {
             checkSmokeBuild(
-                archs = listOf("x64", "arm64", "arm32"),
+                archs = listOf("x64", "arm64"),
                 targetPrefix = "ios",
                 expectedPlistPlatform = "iPhoneOS"
             )
@@ -35,7 +35,6 @@ class FatFrameworkIT : KGPBaseTest() {
             assertProcessRunResult(runProcess(listOf("file", binary), projectPath.toFile())) {
                 assertTrue(isSuccessful)
                 assertTrue(output.contains("\\(for architecture x86_64\\):\\s+Mach-O 64-bit dynamically linked shared library x86_64".toRegex()))
-                assertTrue(output.contains("\\(for architecture armv7\\):\\s+Mach-O dynamically linked shared library arm_v7".toRegex()))
                 assertTrue(output.contains("\\(for architecture arm64\\):\\s+Mach-O 64-bit dynamically linked shared library arm64".toRegex()))
             }
         }
@@ -49,12 +48,11 @@ class FatFrameworkIT : KGPBaseTest() {
             gradleVersion,
         ) {
             buildGradleKts.modify {
-                it.checkedReplace("iosArm32()", "watchosArm32()")
+                it.checkedReplace("iosArm64()", "watchosArm64(); watchosDeviceArm64()")
-                    .checkedReplace("iosArm64()", "watchosArm64(); watchosDeviceArm64()")
                     .checkedReplace("iosX64()", "watchosX64()")
             }
             checkSmokeBuild(
-                archs = listOf("x64", "arm64", "arm32", "deviceArm64"),
+                archs = listOf("x64", "arm64", "deviceArm64"),
                 targetPrefix = "watchos",
                 expectedPlistPlatform = "WatchOS"
             )
@@ -62,7 +60,6 @@ class FatFrameworkIT : KGPBaseTest() {
             assertProcessRunResult(runProcess(listOf("file", binary), projectPath.toFile())) {
                 assertTrue(isSuccessful)
                 assertTrue(output.contains("\\(for architecture x86_64\\):\\s+Mach-O 64-bit dynamically linked shared library x86_64".toRegex()))
-                assertTrue(output.contains("\\(for architecture armv7k\\):\\s+Mach-O dynamically linked shared library arm_v7k".toRegex()))
                 assertTrue(output.contains("\\(for architecture arm64_32\\):\\s+Mach-O dynamically linked shared library arm64_32_v8".toRegex()))
                 assertTrue(output.contains("\\(for architecture arm64\\):\\s+Mach-O 64-bit dynamically linked shared library arm64".toRegex()))
             }
@@ -77,8 +74,7 @@ class FatFrameworkIT : KGPBaseTest() {
             gradleVersion
         ) {
             buildGradleKts.modify {
-                it.checkedReplace("iosArm32()", "")
+                it.checkedReplace("iosArm64()", "macosArm64()")
-                    .checkedReplace("iosArm64()", "macosArm64()")
                     .checkedReplace("iosX64()", "macosX64()")
             }
             checkSmokeBuild(
@@ -197,9 +193,8 @@ class FatFrameworkIT : KGPBaseTest() {
     fun testDifferentTypes(gradleVersion: GradleVersion) {
         nativeProject("native-fat-framework/smoke", gradleVersion) {
             buildGradleKts.modify {
-                it.checkedReplace("iosArm32()", "iosArm32{binaries.framework {isStatic = true}}")
+                it.checkedReplace("iosArm64()", "iosArm64{binaries.framework {isStatic = false}}")
-                    .checkedReplace("iosArm64()", "iosArm64{binaries.framework {isStatic = false}}")
+                    .checkedReplace("iosX64()", "iosX64{binaries.framework {isStatic = true}}")
-                    .checkedReplace("iosX64()", "iosX64{binaries.framework {isStatic = false}}")
                     .addBeforeSubstring("//", "binaries.framework(listOf(DEBUG))")
             }
             buildAndFail("fat") {
@@ -213,8 +208,7 @@ class FatFrameworkIT : KGPBaseTest() {
     fun testAllStatic(gradleVersion: GradleVersion) {
         nativeProject("native-fat-framework/smoke", gradleVersion) {
             buildGradleKts.modify {
-                it.checkedReplace("iosArm32()", "iosArm32{binaries.framework {isStatic = true}}")
+                it.checkedReplace("iosArm64()", "iosArm64{binaries.framework {isStatic = true}}")
-                    .checkedReplace("iosArm64()", "iosArm64{binaries.framework {isStatic = true}}")
                     .checkedReplace("iosX64()", "iosX64{binaries.framework {isStatic = true}}")
                     .addBeforeSubstring("//", "binaries.framework(listOf(DEBUG))")
             }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt

@@ -24,15 +24,12 @@ class XCFrameworkIT : KGPBaseTest() {
             build("assembleSharedDebugXCFramework") {
                 assertTasksExecuted(":shared:linkDebugFrameworkIosX64")
                 assertTasksExecuted(":shared:linkDebugFrameworkIosArm64")
-                assertTasksExecuted(":shared:linkDebugFrameworkIosArm32")
                 assertTasksExecuted(":shared:linkDebugFrameworkIosSimulatorArm64")
-                assertTasksExecuted(":shared:assembleDebugIosFatFrameworkForSharedXCFramework")
                 assertTasksExecuted(":shared:assembleDebugIosSimulatorFatFrameworkForSharedXCFramework")
                 assertTasksExecuted(":shared:linkDebugFrameworkWatchosArm32")
                 assertTasksExecuted(":shared:linkDebugFrameworkWatchosArm64")
                 assertTasksExecuted(":shared:linkDebugFrameworkWatchosDeviceArm64")
                 assertTasksExecuted(":shared:linkDebugFrameworkWatchosSimulatorArm64")
-                assertTasksExecuted(":shared:linkDebugFrameworkWatchosX86")
                 assertTasksExecuted(":shared:linkDebugFrameworkWatchosX64")
                 assertTasksExecuted(":shared:assembleDebugWatchosFatFrameworkForSharedXCFramework")
                 assertTasksExecuted(":shared:assembleDebugWatchosSimulatorFatFrameworkForSharedXCFramework")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleXCFramework/shared/build.gradle.kts

@@ -15,11 +15,9 @@ kotlin {
 
     val iosX64 = iosX64()
     val iosArm64 = iosArm64()
-    @Suppress("DEPRECATION_ERROR")
-    val iosArm32 = iosArm32()
     val iosSimulatorArm64 = iosSimulatorArm64()
 
-    listOf(iosX64, iosArm64, iosArm32, iosSimulatorArm64).forEach { target ->
+    listOf(iosX64, iosArm64, iosSimulatorArm64).forEach { target ->
         target.binaries.framework {
             baseName = "shared"
             xcf.add(this)
@@ -33,8 +31,6 @@ kotlin {
         watchosArm64(),
         watchosDeviceArm64(),
         watchosSimulatorArm64(),
-        @Suppress("DEPRECATION_ERROR")
-        watchosX86(),
         watchosX64()
     ).forEach { target ->
         target.binaries.framework {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-fat-framework/smoke/build.gradle.kts

@@ -15,8 +15,6 @@ kotlin {
         implementation(kotlin("stdlib-common"))
     }
 
-    @Suppress("DEPRECATION_ERROR")
-    iosArm32()
     iosArm64()
     iosX64()