diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt index 7d50d6b448d..22eb9cf3fea 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt @@ -1270,7 +1270,7 @@ class CocoaPodsIT : BaseGradleIT() { spec.pod_target_xcconfig = { 'KOTLIN_TARGET[sdk=iphonesimulator*]' => 'ios_x64', 'KOTLIN_TARGET[sdk=iphoneos*]' => 'ios_arm', - 'KOTLIN_TARGET[sdk=watchsimulator*]' => 'watchos_x86', + 'KOTLIN_TARGET[sdk=watchsimulator*]' => 'watchos_x64', 'KOTLIN_TARGET[sdk=watchos*]' => 'watchos_arm', 'KOTLIN_TARGET[sdk=appletvsimulator*]' => 'tvos_x64', 'KOTLIN_TARGET[sdk=appletvos*]' => 'tvos_arm64', @@ -1312,7 +1312,7 @@ class CocoaPodsIT : BaseGradleIT() { spec.pod_target_xcconfig = { 'KOTLIN_TARGET[sdk=iphonesimulator*]' => 'ios_x64', 'KOTLIN_TARGET[sdk=iphoneos*]' => 'ios_arm', - 'KOTLIN_TARGET[sdk=watchsimulator*]' => 'watchos_x86', + 'KOTLIN_TARGET[sdk=watchsimulator*]' => 'watchos_x64', 'KOTLIN_TARGET[sdk=watchos*]' => 'watchos_arm', 'KOTLIN_TARGET[sdk=appletvsimulator*]' => 'tvos_x64', 'KOTLIN_TARGET[sdk=appletvos*]' => 'tvos_arm64', diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt index f7d50c756a2..00eb012ee2c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt @@ -66,8 +66,8 @@ class CommonNativeIT : BaseGradleIT() { fun testCommonWatchos() { doCommonNativeTest( "common-watchos", - libTargets = listOf("watchosLibArm32", "watchosLibArm64", "watchosLibX86"), - appTargets = listOf("watchosArm32", "watchosArm64", "watchosX86") + libTargets = listOf("watchosLibArm32", "watchosLibArm64", "watchosLibX64"), + appTargets = listOf("watchosArm32", "watchosArm64", "watchosX64") ) } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/FatFrameworkIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/FatFrameworkIT.kt index d53e2d903a5..7693d52c788 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/FatFrameworkIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/FatFrameworkIT.kt @@ -51,12 +51,12 @@ class FatFrameworkIT : BaseGradleIT() { gradleBuildScript().modify { it.checkedReplace("iosArm32()", "watchosArm32()") .checkedReplace("iosArm64()", "watchosArm64()") - .checkedReplace("iosX64()", "watchosX86()") + .checkedReplace("iosX64()", "watchosX64()") } build("fat") { checkSmokeBuild( - archs = listOf("x86", "arm64", "arm32"), + archs = listOf("x64", "arm64", "arm32"), targetPrefix = "watchos", expectedPlistPlatform = "WatchOS" ) @@ -64,7 +64,7 @@ class FatFrameworkIT : BaseGradleIT() { val binary = fileInWorkingDir("build/fat-framework/smoke.framework/smoke") with(runProcess(listOf("file", binary.absolutePath), projectDir)) { assertTrue(isSuccessful) - assertTrue(output.contains("\\(for architecture i386\\):\\s+Mach-O dynamically linked shared library i386".toRegex())) + 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())) } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/src/watchosX86Main/kotlin/simulator.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/src/watchosX64Main/kotlin/simulator.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/src/watchosX86Main/kotlin/simulator.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/src/watchosX64Main/kotlin/simulator.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/lib/src/watchosLibX86Main/kotlin/simulator.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/lib/src/watchosLibX64Main/kotlin/simulator.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/lib/src/watchosLibX86Main/kotlin/simulator.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/lib/src/watchosLibX64Main/kotlin/simulator.kt