diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt index bcfec92b531..30907e6f48e 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.gradle.plugin.sources.SourceSetConsistencyChecks import org.jetbrains.kotlin.gradle.util.checkBytecodeContains import org.jetbrains.kotlin.gradle.util.isWindows import org.jetbrains.kotlin.gradle.util.modify +import org.jetbrains.kotlin.konan.target.HostManager import org.junit.Assert import org.junit.Test import java.util.zip.ZipFile @@ -28,7 +29,12 @@ class NewMultiplatformIT : BaseGradleIT() { val appProject = Project("sample-app", gradleVersion, "new-mpp-lib-and-app") val oldStyleAppProject = Project("sample-old-style-app", gradleVersion, "new-mpp-lib-and-app") - val hostTargetName = if (isWindows) "mingw64" else "linux64" + val hostTargetName = when { + HostManager.hostIsMingw -> "mingw64" + HostManager.hostIsLinux -> "linux64" + HostManager.hostIsMac -> "macos64" + else -> error("Unknown host") + } val compileTasksNames = listOf("Jvm6", "NodeJs", "Metadata", "Wasm32", hostTargetName.capitalize()).map { ":compileKotlin$it" } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/build.gradle index 2d95e760f1c..5c5829b7b33 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/build.gradle @@ -61,8 +61,9 @@ kotlin { fromPreset(presets.wasm32, 'wasm32') fromPreset(presets.linuxX64, 'linux64') fromPreset(presets.mingwX64, 'mingw64') + fromPreset(presets.macosX64, 'macos64') - configure([wasm32, linux64, mingw64]) { + configure([wasm32, linux64, mingw64, macos64]) { compilations.main.outputKinds += org.jetbrains.kotlin.gradle.plugin.mpp.NativeOutputKind.EXECUTABLE } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/src/macos64Main/kotlin/macos64App.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/src/macos64Main/kotlin/macos64App.kt new file mode 100644 index 00000000000..7a4a64cc0be --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/src/macos64Main/kotlin/macos64App.kt @@ -0,0 +1,11 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +import com.example.lib.* + +fun main(args: Array) { + id(id(123)) + expectedFun() +} \ No newline at end of file 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 e3873c87268..f5159c8e2d4 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 @@ -26,6 +26,7 @@ kotlin { fromPreset(presets.wasm32, 'wasm32') fromPreset(presets.linuxX64, 'linux64') fromPreset(presets.mingwX64, 'mingw64') + fromPreset(presets.macosX64, 'macos64') } sourceSets { jvm6Main { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/src/macos64Main/kotlin/Main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/src/macos64Main/kotlin/Main.kt new file mode 100644 index 00000000000..d25550aaefc --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/src/macos64Main/kotlin/Main.kt @@ -0,0 +1,10 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package com.example.lib + +actual fun expectedFun(): Unit { + id(123) +} \ No newline at end of file