From eb5a2f65bdc33a36fc6ed2f79d868bbafab3f2d0 Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Wed, 5 Oct 2022 14:08:39 +0200 Subject: [PATCH] [Gradle] Fix tests after adding `watchosDeviceArm64` target ^KT-53107 --- .../jetbrains/kotlin/gradle/native/AppleFrameworkNonMacIT.kt | 1 + .../kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt | 2 ++ .../testProject/appleXCFramework/shared/build.gradle.kts | 1 + 3 files changed, 4 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkNonMacIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkNonMacIT.kt index 1232a3ad72c..ab948460322 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkNonMacIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkNonMacIT.kt @@ -38,6 +38,7 @@ class AppleFrameworkNonMacIT : BaseGradleIT() { assertTasksSkipped(":shared:linkDebugFrameworkIosX64") assertTasksSkipped(":shared:linkDebugFrameworkWatchosArm32") assertTasksSkipped(":shared:linkDebugFrameworkWatchosArm64") + assertTasksSkipped(":shared:linkDebugFrameworkWatchosDeviceArm64") assertTasksSkipped(":shared:linkDebugFrameworkWatchosX64") assertTasksSkipped(":shared:assembleDebugWatchosFatFrameworkForSharedXCFramework") assertTasksSkipped(":shared:assembleSharedDebugXCFramework") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt index 76d497d45be..a9be8a33da9 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt @@ -43,6 +43,7 @@ class XCFrameworkIT : BaseGradleIT() { assertTasksExecuted(":shared:assembleDebugIosSimulatorFatFrameworkForSharedXCFramework") assertTasksExecuted(":shared:linkDebugFrameworkWatchosArm32") assertTasksExecuted(":shared:linkDebugFrameworkWatchosArm64") + assertTasksExecuted(":shared:linkDebugFrameworkWatchosDeviceArm64") assertTasksExecuted(":shared:linkDebugFrameworkWatchosSimulatorArm64") assertTasksExecuted(":shared:linkDebugFrameworkWatchosX86") assertTasksExecuted(":shared:linkDebugFrameworkWatchosX64") @@ -61,6 +62,7 @@ class XCFrameworkIT : BaseGradleIT() { assertTasksUpToDate(":shared:linkDebugFrameworkIosX64") assertTasksUpToDate(":shared:linkDebugFrameworkWatchosArm32") assertTasksUpToDate(":shared:linkDebugFrameworkWatchosArm64") + assertTasksUpToDate(":shared:linkDebugFrameworkWatchosDeviceArm64") assertTasksUpToDate(":shared:linkDebugFrameworkWatchosX64") assertTasksUpToDate(":shared:assembleDebugWatchosFatFrameworkForSharedXCFramework") assertTasksUpToDate(":shared:assembleSharedDebugXCFramework") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleXCFramework/shared/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleXCFramework/shared/build.gradle.kts index 2f62032c389..58ca18f2644 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleXCFramework/shared/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleXCFramework/shared/build.gradle.kts @@ -30,6 +30,7 @@ kotlin { listOf( watchosArm32(), watchosArm64(), + watchosDeviceArm64(), watchosSimulatorArm64(), watchosX86(), watchosX64()