Add more apple native targets (#777)

Co-authored-by: hfhbd <[email protected]>
hfhbd · Aug 16, 2023 · 8fa7050 · 8fa7050
1 parent d7b770f
commit 8fa7050
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 30 deletions.
diff --git a/clients/build.gradle.kts b/clients/build.gradle.kts
@@ -19,9 +19,15 @@ sqldelight {
 kotlin {
     jvmToolchain(8)
 
+    targetHierarchy.default()
+
     androidTarget()
     jvm("desktop")
 
+    js(IR) {
+        browser()
+    }
+
     val xcf = XCFramework()
     fun KotlinNativeTarget.config() {
         binaries {
@@ -35,16 +41,20 @@ kotlin {
             }
         }
     }
-    iosArm64 {
-        config()
-    }
-    iosSimulatorArm64 {
-        config()
-    }
 
-    js(IR) {
-        browser()
-    }
+    macosX64 { config() }
+    macosArm64 { config() }
+
+    iosArm64 { config() }
+    iosSimulatorArm64 { config() }
+
+    watchosArm32 { config() }
+    watchosArm64 { config() }
+    // watchosDeviceArm64 { config() }
+    watchosSimulatorArm64 { config() }
+
+    tvosArm64 { config() }
+    tvosSimulatorArm64 { config() }
 
     sourceSets {
         commonMain {
@@ -70,30 +80,12 @@ kotlin {
             }
         }
 
-        val iosMain by creating {
-            dependsOn(commonMain.get())
+        named("appleMain") {
             dependencies {
                 implementation(libs.ktor.client.darwin)
                 implementation(libs.sqldelight.nativeDriver)
             }
         }
-        val iosTest by creating {
-            dependsOn(commonTest.get())
-        }
-
-        val iosArm64Main by getting {
-            dependsOn(iosMain)
-        }
-        val iosArm64Test by getting {
-            dependsOn(iosTest)
-        }
-
-        val iosSimulatorArm64Main by getting {
-            dependsOn(iosMain)
-        }
-        val iosSimulatorArm64Test by getting {
-            dependsOn(iosTest)
-        }
     }
 }
 

diff --git a/.../kotlin/app/softwork/composetodo/Flows.kt → .../kotlin/app/softwork/composetodo/Flows.kt b/.../kotlin/app/softwork/composetodo/Flows.kt → .../kotlin/app/softwork/composetodo/Flows.kt
diff --git a/.../app/softwork/composetodo/IosContainer.kt → .../app/softwork/composetodo/IosContainer.kt b/.../app/softwork/composetodo/IosContainer.kt → .../app/softwork/composetodo/IosContainer.kt
diff --git a/.../composetodo/UserDefaultsCookieStorage.kt → .../composetodo/UserDefaultsCookieStorage.kt b/.../composetodo/UserDefaultsCookieStorage.kt → .../composetodo/UserDefaultsCookieStorage.kt
diff --git a/...rk/composetodo/viewmodels/ViewModeliOS.kt → ...rk/composetodo/viewmodels/ViewModeliOS.kt b/...rk/composetodo/viewmodels/ViewModeliOS.kt → ...rk/composetodo/viewmodels/ViewModeliOS.kt
diff --git a/...lin/app/softwork/composetodo/FlowsTest.kt → ...lin/app/softwork/composetodo/FlowsTest.kt b/...lin/app/softwork/composetodo/FlowsTest.kt → ...lin/app/softwork/composetodo/FlowsTest.kt
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile
+import org.jetbrains.kotlin.gradle.dsl.*
 
 plugins {
     kotlin("multiplatform")
@@ -9,12 +9,25 @@ plugins {
 kotlin {
     jvmToolchain(8)
 
+    jvm()
+
     js(IR) {
         browser()
     }
+
+    macosX64()
+    macosArm64()
+
     iosArm64()
     iosSimulatorArm64()
-    jvm()
+
+    watchosArm32()
+    watchosArm64()
+    // watchosDeviceArm64()
+    watchosSimulatorArm64()
+
+    tvosArm64()
+    tvosSimulatorArm64()
 
     explicitApi()