azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KotlinTargetContainerWithNativeShortcuts: Remove macos arm based targets

Browse Source 
^KT-47126 Verification Pending
This commit is contained in:
sebastian.sellmair
2021-06-22 09:28:53 +02:00
committed by Space
parent 9b49d0cf76
commit 2006f89260
2 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchically/p1/build.gradle.kts
+10 -3
View File
@@ -21,7 +21,9 @@ kotlin {
linuxX64()
linuxArm64()
macos()
macosX64()
macosArm64()
ios()
mingwX64("windowsX64")
@@ -37,7 +39,9 @@ kotlin {
val linuxX64Main by sourceSets.getting
val linuxArm64Main by sourceSets.getting
val appleMain by sourceSets.creating
val macosMain by sourceSets.getting
val macosMain by sourceSets.creating
val macosX64Main by sourceSets.getting
val macosArm64Main by sourceSets.getting
val iosMain by sourceSets.getting
val windowsMain by sourceSets.creating
val windowsX64Main by sourceSets.getting
@@ -51,7 +55,10 @@ kotlin {
-appleAndLinuxMain {
-appleMain {
-iosMain
-macosMain
-macosMain {
-macosX64Main
-macosArm64Main
}
}
-linuxMain {
-linuxArm64Main
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithNativeShortcuts.kt
+4 -25
View File
@@ -54,32 +54,13 @@ interface KotlinTargetContainerWithNativeShortcuts : KotlinTargetContainerWithPr
return DefaultSourceSets(main, test)
}
fun macos(
namePrefix: String = "macos",
configure: KotlinNativeTarget.() -> Unit = {}
) {
val targets = listOf(
macosX64("${namePrefix}X64"),
macosArm64("${namePrefix}Arm64")
)
createIntermediateSourceSets(namePrefix, targets.defaultSourceSets(), mostCommonSourceSets())
targets.forEach { it.configure() }
}
fun macos() = macos("macos") { }
fun macos(namePrefix: String) = macos(namePrefix) { }
fun macos(namePrefix: String, configure: Closure<*>) = macos(namePrefix) { ConfigureUtil.configure(configure, this) }
fun macos(configure: Closure<*>) = macos { ConfigureUtil.configure(configure, this) }
fun ios(
namePrefix: String = "ios",
configure: KotlinNativeTarget.() -> Unit = {}
) {
val targets = listOf(
iosArm64("${namePrefix}Arm64"),
iosX64("${namePrefix}X64"),
iosSimulatorArm64("${namePrefix}SimulatorArm64")
iosX64("${namePrefix}X64")
)
createIntermediateSourceSets(namePrefix, targets.defaultSourceSets(), mostCommonSourceSets())
targets.forEach { it.configure() }
@@ -96,8 +77,7 @@ interface KotlinTargetContainerWithNativeShortcuts : KotlinTargetContainerWithPr
) {
val targets = listOf(
tvosArm64("${namePrefix}Arm64"),
tvosX64("${namePrefix}X64"),
tvosSimulatorArm64("${namePrefix}SimulatorArm64")
tvosX64("${namePrefix}X64")
)
createIntermediateSourceSets(namePrefix, targets.defaultSourceSets(), mostCommonSourceSets())
targets.forEach { it.configure() }
@@ -115,7 +95,6 @@ interface KotlinTargetContainerWithNativeShortcuts : KotlinTargetContainerWithPr
val device32 = watchosArm32("${namePrefix}Arm32")
val device64 = watchosArm64("${namePrefix}Arm64")
val simulatorX64 = watchosX64("${namePrefix}X64")
val simulatorArm64 = watchosSimulatorArm64("${namePrefix}SimulatorArm64")
val deviceTargets = listOf(device32, device64)
val deviceSourceSets = createIntermediateSourceSets(
@@ -125,11 +104,11 @@ interface KotlinTargetContainerWithNativeShortcuts : KotlinTargetContainerWithPr
createIntermediateSourceSets(
namePrefix,
listOf(deviceSourceSets, simulatorX64.defaultSourceSets(), simulatorArm64.defaultSourceSets()),
listOf(deviceSourceSets, simulatorX64.defaultSourceSets()),
mostCommonSourceSets()
)
listOf(device32, device64, simulatorX64, simulatorArm64).forEach { it.configure() }
listOf(device32, device64, simulatorX64).forEach { it.configure() }
}
fun watchos() = watchos("watchos") { }