Add Apple targets to modules (#68)

JuulLabs · Jul 6, 2021 · 3e3cf80 · 3e3cf80
1 parent fde4eb7
commit 3e3cf80
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -8,6 +8,7 @@ Toolbox of utilities/helpers for Kotlin development.
 ## [Coroutines](https://juullabs.github.io/tuulbox/coroutines/index.html)
 
 ![badge-android]
+![badge-ios]
 ![badge-js]
 ![badge-jvm]
 ![badge-mac]
@@ -32,6 +33,7 @@ val combined = combine(
 
 ## [Logging](https://juullabs.github.io/tuulbox/logging/index.html)
 
+![badge-ios]
 ![badge-js]
 ![badge-jvm]
 ![badge-mac]
@@ -69,6 +71,7 @@ via [`Log.tagGenerator`] property.
 
 ## [Functional](https://juullabs.github.io/tuulbox/functional/index.html)
 
+![badge-ios]
 ![badge-js]
 ![badge-jvm]
 ![badge-mac]
@@ -142,6 +145,7 @@ assertSimilar(
 
 ## [Encoding](https://juullabs.github.io/tuulbox/encoding/index.html)
 
+![badge-ios]
 ![badge-js]
 ![badge-jvm]
 ![badge-mac]

diff --git a/coroutines/build.gradle.kts b/coroutines/build.gradle.kts
@@ -17,6 +17,9 @@ kotlin {
         publishAllLibraryVariants()
     }
     macosX64()
+    iosX64()
+    iosArm32()
+    iosArm64()
 
     sourceSets {
         val commonMain by getting {
@@ -57,6 +60,26 @@ kotlin {
                 implementation(kotlin("test-js"))
             }
         }
+
+        val appleMain by creating {
+            dependsOn(commonMain)
+        }
+
+        val macosX64Main by getting {
+            dependsOn(appleMain)
+        }
+
+        val iosX64Main by getting {
+            dependsOn(appleMain)
+        }
+
+        val iosArm32Main by getting {
+            dependsOn(appleMain)
+        }
+
+        val iosArm64Main by getting {
+            dependsOn(appleMain)
+        }
     }
 }
 

diff --git a/encoding/build.gradle.kts b/encoding/build.gradle.kts
@@ -14,6 +14,9 @@ kotlin {
     jvm()
     js().browser()
     macosX64()
+    iosX64()
+    iosArm32()
+    iosArm64()
 
     sourceSets {
         val commonTest by getting {

diff --git a/functional/build.gradle.kts b/functional/build.gradle.kts
@@ -14,8 +14,13 @@ kotlin {
     jvm()
     js().browser()
     macosX64()
+    iosX64()
+    iosArm32()
+    iosArm64()
 
     sourceSets {
+        val commonMain by getting
+
         val commonTest by getting {
             dependencies {
                 implementation(project(":test"))
@@ -35,5 +40,25 @@ kotlin {
                 implementation(kotlin("test-js"))
             }
         }
+
+        val appleMain by creating {
+            dependsOn(commonMain)
+        }
+
+        val macosX64Main by getting {
+            dependsOn(appleMain)
+        }
+
+        val iosX64Main by getting {
+            dependsOn(appleMain)
+        }
+
+        val iosArm32Main by getting {
+            dependsOn(appleMain)
+        }
+
+        val iosArm64Main by getting {
+            dependsOn(appleMain)
+        }
     }
 }
diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts
@@ -15,8 +15,13 @@ kotlin {
     jvm()
     js().browser()
     macosX64()
+    iosX64()
+    iosArm32()
+    iosArm64()
 
     sourceSets {
+        val commonMain by getting
+
         val commonTest by getting {
             dependencies {
                 implementation(project(":test"))
@@ -36,5 +41,25 @@ kotlin {
                 implementation(kotlin("test-js"))
             }
         }
+
+        val appleMain by creating {
+            dependsOn(commonMain)
+        }
+
+        val macosX64Main by getting {
+            dependsOn(appleMain)
+        }
+
+        val iosX64Main by getting {
+            dependsOn(appleMain)
+        }
+
+        val iosArm32Main by getting {
+            dependsOn(appleMain)
+        }
+
+        val iosArm64Main by getting {
+            dependsOn(appleMain)
+        }
     }
 }
diff --git a/.../src/macosX64Main/kotlin/ConsoleLogger.kt → ...ing/src/appleMain/kotlin/ConsoleLogger.kt b/.../src/macosX64Main/kotlin/ConsoleLogger.kt → ...ing/src/appleMain/kotlin/ConsoleLogger.kt
diff --git a/...acosX64Main/kotlin/DefaultTagGenerator.kt → ...c/appleMain/kotlin/DefaultTagGenerator.kt b/...acosX64Main/kotlin/DefaultTagGenerator.kt → ...c/appleMain/kotlin/DefaultTagGenerator.kt
diff --git a/test/build.gradle.kts b/test/build.gradle.kts
@@ -12,6 +12,7 @@ kotlin {
     js().browser()
     macosX64()
     iosX64()
+    iosArm32()
     iosArm64()
 
     sourceSets {
@@ -47,6 +48,10 @@ kotlin {
             dependsOn(appleMain)
         }
 
+        val iosArm32Main by getting {
+            dependsOn(appleMain)
+        }
+
         val iosArm64Main by getting {
             dependsOn(appleMain)
         }