diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt index 4068f2195cb..fc18a074b62 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt @@ -150,7 +150,7 @@ class NativePlatformLibsIT : BaseGradleIT() { deleteInstalledCompilers() val unsupportedTarget = when { - HostManager.hostIsMac -> KonanTarget.MINGW_X64 + HostManager.hostIsMac -> KonanTarget.LINUX_MIPSEL32 else -> KonanTarget.IOS_X64 } @@ -208,7 +208,7 @@ class NativePlatformLibsIT : BaseGradleIT() { assertSuccessful() assertContains("Warning: Project property 'kotlin.native.restrictedDistribution' is deprecated. Please use 'kotlin.native.distribution.type=light' instead") - val osName = simpleOsName(currentCompilerVersion) + val osName = simpleOsName(CompilerVersion.fromString(oldCompilerVersion)) val regex = "Kotlin/Native distribution: .*kotlin-native-restricted-$osName".toRegex() // Restricted distribution is available for Mac hosts only. if (HostManager.hostIsMac) { 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 index 9e48fe81fef..13383023da7 100644 --- 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 @@ -2,12 +2,25 @@ plugins { kotlin("multiplatform") } +repositories { + mavenLocal() + mavenCentral() +} + kotlin { jvm() ios() watchos() tvos() - macos { + iosSimulatorArm64() + tvosSimulatorArm64() + watchosSimulatorArm64() + macosX64 { + binaries.executable { + entryPoint = "main" + } + } + macosArm64 { binaries.executable { entryPoint = "main" } @@ -15,6 +28,16 @@ kotlin { val commonTest by sourceSets.getting val jvmTest by sourceSets.getting + val macosMain by sourceSets.creating + val iosMain by sourceSets.getting + val tvosMain by sourceSets.getting + val watchosMain by sourceSets.getting + + val macosX64Main by sourceSets.getting { dependsOn(macosMain) } + val macosArm64Main by sourceSets.getting { dependsOn(macosMain) } + val iosSimulatorArm64Main by sourceSets.getting { dependsOn(iosMain) } + val tvosSimulatorArm64Main by sourceSets.getting { dependsOn(tvosMain) } + val watchosSimulatorArm64Main by sourceSets.getting { dependsOn(watchosMain) } commonTest.dependencies { implementation(kotlin("test-common")) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/build.gradle index 1f6ef8622cd..b52780a7443 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/build.gradle @@ -32,6 +32,8 @@ kotlin { // We use this library in the cinterop test which includes a Windows x86 target. fromPreset(presets.mingwX86, 'mingw86') + + fromPreset(presets.linuxMipsel32, 'linuxMipsel32') // Check the DSL constructs in the Groovy DSL: fromPreset(presets.jvm, 'jvm6') {