From cc571a876a68e6f4592da0c962e62abbc9386786 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Tue, 18 May 2021 12:13:34 +0200 Subject: [PATCH] [Gradle] Implement AppleSiliconIT ^KT-45302 --- .../kotlin/gradle/native/AppleSiliconIT.kt | 123 ++++++++++++++++++ .../testProject/appleSilicon/build.gradle.kts | 43 ++++++ .../appleSilicon/gradle.properties | 4 + .../appleSilicon/settings.gradle.kts | 10 ++ .../src/commonMain/kotlin/main.kt | 5 + .../src/commonTest/kotlin/MainTest.kt | 8 ++ .../src/iosArm64Main/kotlin/main.kt | 1 + .../appleSilicon/src/iosMain/kotlin/main.kt | 3 + .../src/iosSimulatorArm64Main/kotlin/main.kt | 1 + .../src/iosX64Main/kotlin/main.kt | 1 + .../src/jvmMain/kotlin/jvmMain.kt | 1 + .../kotlin/sourceSetsAfterMacosMain.kt | 2 + .../appleSilicon/src/macosMain/kotlin/main.kt | 4 + .../kotlin/sourceSetsAfterMacosMain.kt | 2 + .../src/macosX64Main/kotlin/target.kt | 0 .../kotlin/sourceSetsAfterTvOsMain.kt | 1 + .../appleSilicon/src/tvosMain/kotlin/main.kt | 3 + .../kotlin/sourceSetsAfterTvOsMain.kt | 1 + .../kotlin/sourceSetsAfterTvOsMain.kt | 1 + .../kotlin/sourceSetsAfterWatchosMain.kt | 1 + .../kotlin/sourceSetsAfterWatchosMain.kt | 1 + .../src/watchosMain/kotlin/main.kt | 3 + .../kotlin/sourceSetsAfterWatchosMain.kt | 1 + .../kotlin/sourceSetsAfterWatchosMain.kt | 1 + 24 files changed, 221 insertions(+) create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleSiliconIT.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/build.gradle.kts create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/gradle.properties create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/settings.gradle.kts create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/commonMain/kotlin/main.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/commonTest/kotlin/MainTest.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/iosArm64Main/kotlin/main.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/iosMain/kotlin/main.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/iosSimulatorArm64Main/kotlin/main.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/iosX64Main/kotlin/main.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/jvmMain/kotlin/jvmMain.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/macosArm64Main/kotlin/sourceSetsAfterMacosMain.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/macosMain/kotlin/main.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/macosX64Main/kotlin/sourceSetsAfterMacosMain.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/macosX64Main/kotlin/target.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/tvosArm64Main/kotlin/sourceSetsAfterTvOsMain.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/tvosMain/kotlin/main.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/tvosSimulatorArm64Main/kotlin/sourceSetsAfterTvOsMain.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/tvosX64Main/kotlin/sourceSetsAfterTvOsMain.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/watchosArm32Main/kotlin/sourceSetsAfterWatchosMain.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/watchosArm64Main/kotlin/sourceSetsAfterWatchosMain.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/watchosMain/kotlin/main.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/watchosSimulatorArm64Main/kotlin/sourceSetsAfterWatchosMain.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/watchosX64Main/kotlin/sourceSetsAfterWatchosMain.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleSiliconIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleSiliconIT.kt new file mode 100644 index 00000000000..60188251069 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleSiliconIT.kt @@ -0,0 +1,123 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.native + +import org.jetbrains.kotlin.gradle.BaseGradleIT +import org.jetbrains.kotlin.gradle.GradleVersionRequired +import org.jetbrains.kotlin.konan.target.HostManager +import org.jetbrains.kotlin.konan.target.KonanTarget +import org.junit.Assume.assumeTrue +import org.junit.Test +import kotlin.test.BeforeTest +import kotlin.test.fail + +class AppleSiliconIT : BaseGradleIT() { + override val defaultGradleVersion: GradleVersionRequired = GradleVersionRequired.FOR_MPP_SUPPORT + + private val host = HostManager.host + + @BeforeTest + fun assumeMacosHost() { + assumeTrue("Test requires MacOS host", HostManager.hostIsMac) + } + + @Test + fun `test compilation`() { + with(Project("appleSilicon")) { + build("assemble") { + assertSuccessful() + assertTasksExecuted( + ":compileKotlinIosArm64", + ":compileKotlinIosSimulatorArm64", + ":compileKotlinIosX64", + ":compileKotlinMacosArm64", + ":compileKotlinMacosX64", + ":compileKotlinTvosArm64", + ":compileKotlinTvosSimulatorArm64", + ":compileKotlinTvosX64", + ":compileKotlinWatchosArm32", + ":compileKotlinWatchosArm64", + ":compileKotlinWatchosSimulatorArm64", + ":compileKotlinWatchosX64", + ":compileKotlinJvm", + ":jvmJar", + ":linkDebugExecutableMacosArm64", + ":linkDebugExecutableMacosX64", + ":linkReleaseExecutableMacosArm64", + ":linkReleaseExecutableMacosX64", + ) + } + } + } + + @Test + fun `test execution`() { + with(Project("appleSilicon")) { + build("check") { + assertSuccessful() + assertTasksExecuted(":jvmTest") + assertContains("Executed Code from: commonMain/jvmMain") + + val armTestOutputs = listOf( + "commonMain/iosMain/iosSimulatorArm64Main", + "commonMain/macosMain/macosArm64Main", + "commonMain/tvosMain/tvosSimulatorArm64Main", + "commonMain/watchosMain/watchosSimulatorArm64Main" + ).map { "Executed Code from: $it" } + + val x64TestOutputs = listOf( + "commonMain/iosMain/iosX64Main", + "commonMain/macosMain/macosX64Main", + "commonMain/tvosMain/tvosX64Main", + "commonMain/watchosMain/watchosX64Main" + ).map { "Executed Code from: $it" } + + when (host) { + KonanTarget.MACOS_ARM64 -> { + assertContains(*armTestOutputs.toTypedArray()) + assertNotContains(*x64TestOutputs.toTypedArray()) + } + + KonanTarget.MACOS_X64 -> { + assertContains(*x64TestOutputs.toTypedArray()) + assertNotContains(*armTestOutputs.toTypedArray()) + } + + else -> fail("Unexpected host $host") + } + + val armTests = listOf( + ":iosSimulatorArm64Test", + ":macosArm64Test", + ":tvosSimulatorArm64Test", + ":watchosSimulatorArm64Test", + ) + + val x64Tests = listOf( + ":iosX64Test", + ":jvmTest", + ":macosX64Test", + ":tvosX64Test", + ":watchosX64Test", + ) + + when (host) { + KonanTarget.MACOS_ARM64 -> { + assertTasksExecuted(armTests) + assertTasksNotExecuted(x64Tests) + } + + KonanTarget.MACOS_X64 -> { + assertTasksExecuted(x64Tests) + assertTasksNotExecuted(armTests) + } + + else -> fail("Unexpected host $host") + } + } + } + } +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/build.gradle.kts new file mode 100644 index 00000000000..9e48fe81fef --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/build.gradle.kts @@ -0,0 +1,43 @@ +plugins { + kotlin("multiplatform") +} + +kotlin { + jvm() + ios() + watchos() + tvos() + macos { + binaries.executable { + entryPoint = "main" + } + } + + val commonTest by sourceSets.getting + val jvmTest by sourceSets.getting + + commonTest.dependencies { + implementation(kotlin("test-common")) + implementation(kotlin("test-annotations-common")) + } + + jvmTest.dependencies { + implementation(kotlin("test-junit")) + } + + tasks.withType().configureEach { + testLogging { + showStandardStreams = true + } + } +} + + +allprojects { + repositories { + mavenCentral() + google() + mavenLocal() + } +} + diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/gradle.properties new file mode 100644 index 00000000000..ddcf1596570 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/gradle.properties @@ -0,0 +1,4 @@ +kotlin.code.style=official +kotlin.js.generate.executable.default=false +kotlin.mpp.enableGranularSourceSetsMetadata=true +kotlin.native.enableDependencyPropagation=false diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/settings.gradle.kts new file mode 100644 index 00000000000..ecdece6ecfe --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/settings.gradle.kts @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + mavenLocal() + gradlePluginPortal() + } + val kotlin_version: String by settings + plugins { + kotlin("multiplatform").version(kotlin_version) + } +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/commonMain/kotlin/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/commonMain/kotlin/main.kt new file mode 100644 index 00000000000..d206033d8e6 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/commonMain/kotlin/main.kt @@ -0,0 +1,5 @@ +fun main() { + println("Executed Code from: commonMain/$sourceSetsAfterCommonMain") +} + +expect val sourceSetsAfterCommonMain: String diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/commonTest/kotlin/MainTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/commonTest/kotlin/MainTest.kt new file mode 100644 index 00000000000..085d8a2edfe --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/commonTest/kotlin/MainTest.kt @@ -0,0 +1,8 @@ +import kotlin.test.Test + +class MainTest { + @Test + fun run() { + main() + } +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/iosArm64Main/kotlin/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/iosArm64Main/kotlin/main.kt new file mode 100644 index 00000000000..8766c10633c --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/iosArm64Main/kotlin/main.kt @@ -0,0 +1 @@ +actual val sourceSetsAfterIosMain: String = "iosArm64" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/iosMain/kotlin/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/iosMain/kotlin/main.kt new file mode 100644 index 00000000000..163ba43fa5e --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/iosMain/kotlin/main.kt @@ -0,0 +1,3 @@ +actual val sourceSetsAfterCommonMain get() = "iosMain/$sourceSetsAfterIosMain" + +expect val sourceSetsAfterIosMain: String \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/iosSimulatorArm64Main/kotlin/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/iosSimulatorArm64Main/kotlin/main.kt new file mode 100644 index 00000000000..7203ace8edc --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/iosSimulatorArm64Main/kotlin/main.kt @@ -0,0 +1 @@ +actual val sourceSetsAfterIosMain: String = "iosSimulatorArm64Main" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/iosX64Main/kotlin/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/iosX64Main/kotlin/main.kt new file mode 100644 index 00000000000..efa2841fcfd --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/iosX64Main/kotlin/main.kt @@ -0,0 +1 @@ +actual val sourceSetsAfterIosMain: String = "iosX64Main" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/jvmMain/kotlin/jvmMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/jvmMain/kotlin/jvmMain.kt new file mode 100644 index 00000000000..de0fde4e40a --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/jvmMain/kotlin/jvmMain.kt @@ -0,0 +1 @@ +actual val sourceSetsAfterCommonMain = "jvmMain" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/macosArm64Main/kotlin/sourceSetsAfterMacosMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/macosArm64Main/kotlin/sourceSetsAfterMacosMain.kt new file mode 100644 index 00000000000..ae044106bd3 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/macosArm64Main/kotlin/sourceSetsAfterMacosMain.kt @@ -0,0 +1,2 @@ +actual val sourceSetsAfterMacosMain: String + get() = "macosArm64Main" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/macosMain/kotlin/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/macosMain/kotlin/main.kt new file mode 100644 index 00000000000..ce2b91e01e3 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/macosMain/kotlin/main.kt @@ -0,0 +1,4 @@ +actual val sourceSetsAfterCommonMain get() = "macosMain/$sourceSetsAfterMacosMain" + +expect val sourceSetsAfterMacosMain: String + diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/macosX64Main/kotlin/sourceSetsAfterMacosMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/macosX64Main/kotlin/sourceSetsAfterMacosMain.kt new file mode 100644 index 00000000000..d71337cc694 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/macosX64Main/kotlin/sourceSetsAfterMacosMain.kt @@ -0,0 +1,2 @@ +actual val sourceSetsAfterMacosMain: String + get() = "macosX64Main" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/macosX64Main/kotlin/target.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/macosX64Main/kotlin/target.kt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/tvosArm64Main/kotlin/sourceSetsAfterTvOsMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/tvosArm64Main/kotlin/sourceSetsAfterTvOsMain.kt new file mode 100644 index 00000000000..ca3689a8dfc --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/tvosArm64Main/kotlin/sourceSetsAfterTvOsMain.kt @@ -0,0 +1 @@ +actual val sourceSetsAfterTvOsMain: String = "tvosArm64Main" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/tvosMain/kotlin/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/tvosMain/kotlin/main.kt new file mode 100644 index 00000000000..9007d3149ae --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/tvosMain/kotlin/main.kt @@ -0,0 +1,3 @@ +actual val sourceSetsAfterCommonMain get() = "tvosMain/$sourceSetsAfterTvOsMain" + +expect val sourceSetsAfterTvOsMain: String \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/tvosSimulatorArm64Main/kotlin/sourceSetsAfterTvOsMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/tvosSimulatorArm64Main/kotlin/sourceSetsAfterTvOsMain.kt new file mode 100644 index 00000000000..0ea8cddd8b3 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/tvosSimulatorArm64Main/kotlin/sourceSetsAfterTvOsMain.kt @@ -0,0 +1 @@ +actual val sourceSetsAfterTvOsMain: String = "tvosSimulatorArm64Main" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/tvosX64Main/kotlin/sourceSetsAfterTvOsMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/tvosX64Main/kotlin/sourceSetsAfterTvOsMain.kt new file mode 100644 index 00000000000..89c76fe66c5 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/tvosX64Main/kotlin/sourceSetsAfterTvOsMain.kt @@ -0,0 +1 @@ +actual val sourceSetsAfterTvOsMain: String = "tvosX64Main" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/watchosArm32Main/kotlin/sourceSetsAfterWatchosMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/watchosArm32Main/kotlin/sourceSetsAfterWatchosMain.kt new file mode 100644 index 00000000000..b5a08b0be0a --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/watchosArm32Main/kotlin/sourceSetsAfterWatchosMain.kt @@ -0,0 +1 @@ +actual val sourceSetsAfterWatchosMain: String = "watchosArm32Main" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/watchosArm64Main/kotlin/sourceSetsAfterWatchosMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/watchosArm64Main/kotlin/sourceSetsAfterWatchosMain.kt new file mode 100644 index 00000000000..5e401eb868b --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/watchosArm64Main/kotlin/sourceSetsAfterWatchosMain.kt @@ -0,0 +1 @@ +actual val sourceSetsAfterWatchosMain: String = "watchosArm64Main" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/watchosMain/kotlin/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/watchosMain/kotlin/main.kt new file mode 100644 index 00000000000..7c21265cd21 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/watchosMain/kotlin/main.kt @@ -0,0 +1,3 @@ +actual val sourceSetsAfterCommonMain get() = "watchosMain/$sourceSetsAfterWatchosMain" + +expect val sourceSetsAfterWatchosMain: String \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/watchosSimulatorArm64Main/kotlin/sourceSetsAfterWatchosMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/watchosSimulatorArm64Main/kotlin/sourceSetsAfterWatchosMain.kt new file mode 100644 index 00000000000..f4a34f11579 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/watchosSimulatorArm64Main/kotlin/sourceSetsAfterWatchosMain.kt @@ -0,0 +1 @@ +actual val sourceSetsAfterWatchosMain: String = "watchosSimulatorArm64Main" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/watchosX64Main/kotlin/sourceSetsAfterWatchosMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/watchosX64Main/kotlin/sourceSetsAfterWatchosMain.kt new file mode 100644 index 00000000000..e06928f0cab --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/src/watchosX64Main/kotlin/sourceSetsAfterWatchosMain.kt @@ -0,0 +1 @@ +actual val sourceSetsAfterWatchosMain: String = "watchosX64Main" \ No newline at end of file