[MPP] Specify missing target for arm macOS
^KT-61439
This commit is contained in:
committed by
Space Team
parent
355ad3e641
commit
53645bce2b
+3
@@ -242,6 +242,9 @@ internal class CompilerOptionsIT : KGPBaseTest() {
|
||||
| macos64Main {
|
||||
| languageSettings.optIn("my.custom.OptInAnnotation")
|
||||
| }
|
||||
| macosArm64Main {
|
||||
| languageSettings.optIn("my.custom.OptInAnnotation")
|
||||
| }
|
||||
| }
|
||||
|}
|
||||
|
|
||||
|
||||
+3
-1
@@ -777,6 +777,7 @@ open class NewMultiplatformIT : BaseGradleIT() {
|
||||
|kotlin.sourceSets.nativeMain.${initialSetupForSourceSets}
|
||||
|kotlin.sourceSets.linux64Main.${initialSetupForSourceSets}
|
||||
|kotlin.sourceSets.macos64Main.${initialSetupForSourceSets}
|
||||
|kotlin.sourceSets.macosArm64Main.${initialSetupForSourceSets}
|
||||
|kotlin.sourceSets.jvm6Main.${initialSetupForSourceSets}
|
||||
|kotlin.sourceSets.mingw64Main.${initialSetupForSourceSets}
|
||||
|kotlin.sourceSets.nodeJsMain.${initialSetupForSourceSets}
|
||||
@@ -795,6 +796,7 @@ open class NewMultiplatformIT : BaseGradleIT() {
|
||||
|kotlin.sourceSets.nativeMain.${sourceSetConfigurationChange}
|
||||
|kotlin.sourceSets.linux64Main.${sourceSetConfigurationChange}
|
||||
|kotlin.sourceSets.macos64Main.${sourceSetConfigurationChange}
|
||||
|kotlin.sourceSets.macosArm64Main.${sourceSetConfigurationChange}
|
||||
|kotlin.sourceSets.jvm6Main.${sourceSetConfigurationChange}
|
||||
|kotlin.sourceSets.mingw64Main.${sourceSetConfigurationChange}
|
||||
|kotlin.sourceSets.nodeJsMain.${sourceSetConfigurationChange}
|
||||
@@ -1426,7 +1428,7 @@ open class NewMultiplatformIT : BaseGradleIT() {
|
||||
}
|
||||
|
||||
val expectedDefaultSourceSets = listOf(
|
||||
"jvm6", "nodeJs", "mingw64", "linux64", "macos64", "wasmJs"
|
||||
"jvm6", "nodeJs", "mingw64", "linux64", "macos64", "macosArm64", "wasmJs"
|
||||
).flatMapTo(mutableSetOf()) { target ->
|
||||
listOf("main", "test").map { compilation ->
|
||||
Triple(
|
||||
|
||||
+2
-1
@@ -38,10 +38,11 @@ kotlin {
|
||||
|
||||
targets {
|
||||
macosX64("macos64")
|
||||
macosArm64("macosArm64")
|
||||
linuxX64("linux64")
|
||||
mingwX64("mingw64")
|
||||
|
||||
configure([findByName('macos64'), findByName('linux64'), findByName('mingw64')]) {
|
||||
configure([findByName('macos64'), findByName('macosArm64'), findByName('linux64'), findByName('mingw64')]) {
|
||||
compilations.all { kotlinOptions.verbose = true }
|
||||
compilations.test.kotlinOptions.freeCompilerArgs += "-nowarn"
|
||||
binaries {
|
||||
|
||||
+2
-1
@@ -27,10 +27,11 @@ kotlin {
|
||||
}
|
||||
|
||||
val macos = macosX64("macos64")
|
||||
val macosArm = macosArm64("macosArm64")
|
||||
val linux = linuxX64("linux64")
|
||||
val windows = mingwX64("mingw64")
|
||||
|
||||
configure(listOf(macos, linux, windows)) {
|
||||
configure(listOf(macos, macosArm, linux, windows)) {
|
||||
compilations.all { kotlinOptions.verbose = true }
|
||||
compilations["test"].kotlinOptions.freeCompilerArgs += "-nowarn"
|
||||
binaries {
|
||||
|
||||
+2
@@ -38,6 +38,7 @@ kotlin {
|
||||
fromPreset(presets.linuxX64, 'linux64')
|
||||
fromPreset(presets.mingwX64, 'mingw64')
|
||||
fromPreset(presets.macosX64, 'macos64')
|
||||
fromPreset(presets.macosArm64, 'macosArm64')
|
||||
|
||||
// Check the DSL constructs in the Groovy DSL:
|
||||
fromPreset(presets.jvm, 'jvm6') {
|
||||
@@ -95,6 +96,7 @@ kotlin {
|
||||
nativeMain { dependsOn commonMain }
|
||||
linux64Main { dependsOn nativeMain }
|
||||
macos64Main { dependsOn nativeMain }
|
||||
macosArm64Main { dependsOn nativeMain }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+10
@@ -0,0 +1,10 @@
|
||||
/*
|
||||
* Copyright 2010-2018 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 com.example.lib
|
||||
|
||||
actual fun expectedFun(): Unit {
|
||||
id(123)
|
||||
}
|
||||
Reference in New Issue
Block a user