From d3b1ee42be4ed26eaa7f163c2a0c4bc3d04bed5f Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Tue, 18 May 2021 12:28:23 +0200 Subject: [PATCH] [Gradle] Test project 'commonizeHierarchically': Use new 'macos' target shortcut ^KT-45302 --- .../org/jetbrains/kotlin/gradle/CommonizerHierarchicalIT.kt | 5 +++-- .../testProject/commonizeHierarchically/p1/build.gradle.kts | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerHierarchicalIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerHierarchicalIT.kt index 273aa9271cc..76e7929c723 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerHierarchicalIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerHierarchicalIT.kt @@ -61,11 +61,12 @@ class CommonizerHierarchicalIT : BaseGradleIT() { fun `test commonizeHierarchically Klibrary compilations`() { with(Project("commonizeHierarchically")) { if (Os.canCompileApple) { - build(":p1:iosArm64MainKlibrary", ":p1:iosX64MainKlibrary", ":p1:macosMainKlibrary") { + build(":p1:iosArm64MainKlibrary", ":p1:iosX64MainKlibrary", ":p1:macosX64MainKlibrary", ":p1:macosArm64MainKLibrary") { assertSuccessful() assertFileExists("p1/build/classes/kotlin/iosArm64/main/klib/p1.klib") assertFileExists("p1/build/classes/kotlin/iosX64/main/klib/p1.klib") - assertFileExists("p1/build/classes/kotlin/macos/main/klib/p1.klib") + assertFileExists("p1/build/classes/kotlin/macosX64/main/klib/p1.klib") + assertFileExists("p1/build/classes/kotlin/macosArm64/main/klib/p1.klib") } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchically/p1/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchically/p1/build.gradle.kts index 6252242da0c..2a56c68d875 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchically/p1/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchically/p1/build.gradle.kts @@ -21,7 +21,7 @@ kotlin { linuxX64() linuxArm64() - macosX64("macos") + macos() ios() mingwX64("windowsX64")