diff --git a/build.gradle.kts b/build.gradle.kts
index 8a03963b..d4c19fd0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,6 +14,7 @@ plugins {
     id("io.gitlab.arturbosch.detekt") version "1.21.0"
 }
 
+// https://issuetracker.google.com/issues/240445963
 buildscript {
     dependencies {
         classpath("org.apache.commons:commons-compress:1.21")
diff --git a/clients/build.gradle.kts b/clients/build.gradle.kts
index 7ba13d04..8a9cc51d 100644
--- a/clients/build.gradle.kts
+++ b/clients/build.gradle.kts
@@ -40,6 +40,16 @@ kotlin {
         config()
     }
 
+    watchosArm32 {
+        config()
+    }
+    watchosArm64 {
+        config()
+    }
+    watchosSimulatorArm64 {
+        config()
+    }
+
     js(IR) {
         browser()
     }
@@ -70,21 +80,51 @@ kotlin {
             }
         }
 
-        val iosArm64Main by getting {
+        val darwinMain by creating {
+            dependsOn(commonMain.get())
             dependencies {
                 implementation("io.ktor:ktor-client-darwin:$ktor")
                 implementation("app.cash.sqldelight:native-driver:$sqlDelight")
             }
         }
+        val darwinTest by creating {
+            dependsOn(commonTest.get())
+        }
+
+        val iosArm64Main by getting {
+            dependsOn(darwinMain)
+        }
         val iosSimulatorArm64Main by getting {
             dependsOn(iosArm64Main)
         }
 
-        val iosArm64Test by getting
+        val iosArm64Test by getting {
+            dependsOn(darwinTest)
+        }
 
         val iosSimulatorArm64Test by getting {
             dependsOn(iosArm64Test)
         }
+
+        val watchosArm32Main by getting {
+            dependsOn(darwinMain)
+        }
+        val watchosArm32Test by getting {
+            dependsOn(darwinTest)
+        }
+        val watchosArm64Main by getting {
+            dependsOn(darwinMain)
+        }
+        val watchosArm64Test by getting {
+            dependsOn(darwinTest)
+        }
+        val watchosSimulatorArm64Main by getting {
+            dependsOn(darwinMain)
+        }
+        val watchosSimulatorArm64Test by getting {
+            dependsOn(darwinTest)
+        }
+
         val jsMain by getting {
             dependencies {
                 api("app.cash.sqldelight:sqljs-driver:$sqlDelight")
diff --git a/clients/src/iosArm64Main/kotlin/app/softwork/composetodo/Flows.kt b/clients/src/darwinMain/kotlin/app/softwork/composetodo/Flows.kt
similarity index 100%
rename from clients/src/iosArm64Main/kotlin/app/softwork/composetodo/Flows.kt
rename to clients/src/darwinMain/kotlin/app/softwork/composetodo/Flows.kt
diff --git a/clients/src/iosArm64Main/kotlin/app/softwork/composetodo/IosContainer.kt b/clients/src/darwinMain/kotlin/app/softwork/composetodo/IosContainer.kt
similarity index 100%
rename from clients/src/iosArm64Main/kotlin/app/softwork/composetodo/IosContainer.kt
rename to clients/src/darwinMain/kotlin/app/softwork/composetodo/IosContainer.kt
diff --git a/clients/src/iosArm64Main/kotlin/app/softwork/composetodo/UserDefaultsCookieStorage.kt b/clients/src/darwinMain/kotlin/app/softwork/composetodo/UserDefaultsCookieStorage.kt
similarity index 100%
rename from clients/src/iosArm64Main/kotlin/app/softwork/composetodo/UserDefaultsCookieStorage.kt
rename to clients/src/darwinMain/kotlin/app/softwork/composetodo/UserDefaultsCookieStorage.kt
diff --git a/clients/src/iosArm64Main/kotlin/app/softwork/composetodo/viewmodels/ViewModeliOS.kt b/clients/src/darwinMain/kotlin/app/softwork/composetodo/viewmodels/ViewModeliOS.kt
similarity index 100%
rename from clients/src/iosArm64Main/kotlin/app/softwork/composetodo/viewmodels/ViewModeliOS.kt
rename to clients/src/darwinMain/kotlin/app/softwork/composetodo/viewmodels/ViewModeliOS.kt
diff --git a/clients/src/iosArm64Test/kotlin/app/softwork/composetodo/FlowsTest.kt b/clients/src/darwinTest/kotlin/app/softwork/composetodo/FlowsTest.kt
similarity index 100%
rename from clients/src/iosArm64Test/kotlin/app/softwork/composetodo/FlowsTest.kt
rename to clients/src/darwinTest/kotlin/app/softwork/composetodo/FlowsTest.kt
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index 31261095..3fa99ab9 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -10,6 +10,11 @@ kotlin {
     }
     iosArm64()
     iosSimulatorArm64()
+
+    watchosArm32()
+    watchosArm64()
+    watchosSimulatorArm64()
+
     jvm()
 
     explicitApi()