Support more Apple targets (#81)

Autodesk · Apr 30, 2021 · 07b74b6 · 07b74b6
1 parent 9a8188a
commit 07b74b6
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -44,6 +44,13 @@ kotlin {
     iosArm64()
     iosArm32()
     macosX64()
+    tvosArm64()
+    tvosX64()
+    watchosArm32()
+    watchosArm64()
+    // waiting on https://github.com/Kotlin/kotlinx.coroutines/pull/2679
+    //watchosX64()
+    watchosX86()
     mingwX64()
     linuxX64()
 
@@ -53,7 +60,7 @@ kotlin {
         }
     }
 
-    targets.withType<org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget> {
+    targets.withType<KotlinJsTarget> {
         val test by compilations.getting {
             kotlinOptions.freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn")
         }
@@ -92,13 +99,26 @@ kotlin {
 
         val appleMain by creating
 
-        listOf("iosX64", "iosArm64", "iosArm32", "macosX64").forEach {
+        val appleTargets = listOf(
+            "iosX64",
+            "iosArm64",
+            "iosArm32",
+            "macosX64",
+            "tvosArm64",
+            "tvosX64",
+            "watchosArm32",
+            "watchosArm64",
+            "watchosX86"
+            // waiting on https://github.com/Kotlin/kotlinx.coroutines/pull/2679
+            //"watchosX64"
+        )
+        appleTargets.forEach {
             getByName("${it}Main") {
                 dependsOn(appleMain)
             }
         }
 
-        listOf("iosX64", "iosArm64", "iosArm32", "macosX64", "mingwX64", "linuxX64").forEach {
+        (appleTargets + listOf("mingwX64", "linuxX64")).forEach {
             getByName("${it}Main") {
                 dependsOn(nativeMain)
             }

diff --git a/publish.gradle b/publish.gradle
@@ -114,10 +114,17 @@ tasks.register('publishMac') {
     dependsOn 'publishIosArm64PublicationToMavenRepository'
     dependsOn 'publishIosArm32PublicationToMavenRepository'
     dependsOn 'publishIosX64PublicationToMavenRepository'
-    dependsOn 'publishMacosX64PublicationToMavenRepository'
+    dependsOn 'publishJsPublicationToMavenRepository'
     dependsOn 'publishJvmPublicationToMavenRepository'
     dependsOn 'publishKotlinMultiplatformPublicationToMavenRepository'
-    dependsOn 'publishJsPublicationToMavenRepository'
+    dependsOn 'publishMacosX64PublicationToMavenRepository'
+    dependsOn 'publishTvosArm64PublicationToMavenRepository'
+    dependsOn 'publishTvosX64PublicationToMavenRepository'
+    dependsOn 'publishWatchosArm32PublicationToMavenRepository'
+    dependsOn 'publishWatchosArm64PublicationToMavenRepository'
+    // waiting on https://github.com/Kotlin/kotlinx.coroutines/pull/2679
+    //dependsOn 'publishWatchosX64PublicationToMavenRepository'
+    dependsOn 'publishWatchosX86PublicationToMavenRepository'
 }
 
 tasks.register('publishWindows') {