Skip to content
This repository was archived by the owner on Feb 9, 2024. It is now read-only.

Commit 07b74b6

Browse files
author
Ben Asher
authored
Support more Apple targets (#81)
1 parent 9a8188a commit 07b74b6

2 files changed

Lines changed: 32 additions & 5 deletions

File tree

build.gradle.kts

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@ kotlin {
4444
iosArm64()
4545
iosArm32()
4646
macosX64()
47+
tvosArm64()
48+
tvosX64()
49+
watchosArm32()
50+
watchosArm64()
51+
// waiting on https://github.com/Kotlin/kotlinx.coroutines/pull/2679
52+
//watchosX64()
53+
watchosX86()
4754
mingwX64()
4855
linuxX64()
4956

@@ -53,7 +60,7 @@ kotlin {
5360
}
5461
}
5562

56-
targets.withType<org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget> {
63+
targets.withType<KotlinJsTarget> {
5764
val test by compilations.getting {
5865
kotlinOptions.freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn")
5966
}
@@ -92,13 +99,26 @@ kotlin {
9299

93100
val appleMain by creating
94101

95-
listOf("iosX64", "iosArm64", "iosArm32", "macosX64").forEach {
102+
val appleTargets = listOf(
103+
"iosX64",
104+
"iosArm64",
105+
"iosArm32",
106+
"macosX64",
107+
"tvosArm64",
108+
"tvosX64",
109+
"watchosArm32",
110+
"watchosArm64",
111+
"watchosX86"
112+
// waiting on https://github.com/Kotlin/kotlinx.coroutines/pull/2679
113+
//"watchosX64"
114+
)
115+
appleTargets.forEach {
96116
getByName("${it}Main") {
97117
dependsOn(appleMain)
98118
}
99119
}
100120

101-
listOf("iosX64", "iosArm64", "iosArm32", "macosX64", "mingwX64", "linuxX64").forEach {
121+
(appleTargets + listOf("mingwX64", "linuxX64")).forEach {
102122
getByName("${it}Main") {
103123
dependsOn(nativeMain)
104124
}

publish.gradle

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,17 @@ tasks.register('publishMac') {
114114
dependsOn 'publishIosArm64PublicationToMavenRepository'
115115
dependsOn 'publishIosArm32PublicationToMavenRepository'
116116
dependsOn 'publishIosX64PublicationToMavenRepository'
117-
dependsOn 'publishMacosX64PublicationToMavenRepository'
117+
dependsOn 'publishJsPublicationToMavenRepository'
118118
dependsOn 'publishJvmPublicationToMavenRepository'
119119
dependsOn 'publishKotlinMultiplatformPublicationToMavenRepository'
120-
dependsOn 'publishJsPublicationToMavenRepository'
120+
dependsOn 'publishMacosX64PublicationToMavenRepository'
121+
dependsOn 'publishTvosArm64PublicationToMavenRepository'
122+
dependsOn 'publishTvosX64PublicationToMavenRepository'
123+
dependsOn 'publishWatchosArm32PublicationToMavenRepository'
124+
dependsOn 'publishWatchosArm64PublicationToMavenRepository'
125+
// waiting on https://github.com/Kotlin/kotlinx.coroutines/pull/2679
126+
//dependsOn 'publishWatchosX64PublicationToMavenRepository'
127+
dependsOn 'publishWatchosX86PublicationToMavenRepository'
121128
}
122129

123130
tasks.register('publishWindows') {

0 commit comments

Comments
 (0)