chore: remove os check to add ios targets.

GerardPaligot · Oct 18, 2024 · 7694571 · 7694571
1 parent 5d44859
commit 7694571
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 115 deletions.
diff --git a/shared/core-api/build.gradle.kts b/shared/core-api/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
@@ -20,16 +19,14 @@ kotlin {
         browser()
     }
 
-    if (OperatingSystem.current().isMacOsX) {
-        listOf(
-            iosArm64(),
-            iosSimulatorArm64()
-        ).forEach {
-            it.binaries.framework {
-                baseName = "SharedApi"
-                isStatic = false
-                export(projects.shared.models)
-            }
+    listOf(
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "SharedApi"
+            isStatic = false
+            export(projects.shared.models)
         }
     }
 

diff --git a/shared/core-db/build.gradle.kts b/shared/core-db/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.gradle.internal.os.OperatingSystem
-
 plugins {
     id("confily.multiplatform.library")
     id("confily.quality")
@@ -19,17 +17,15 @@ kotlin {
         browser()
     }
 
-    if (OperatingSystem.current().isMacOsX) {
-        listOf(
-            iosArm64(),
-            iosSimulatorArm64()
-        ).forEach {
-            it.binaries.framework {
-                baseName = "SharedDb"
-                isStatic = false
-                // Required https://github.com/cashapp/sqldelight/issues/1442
-                linkerOpts.add("-lsqlite3")
-            }
+    listOf(
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "SharedDb"
+            isStatic = false
+            // Required https://github.com/cashapp/sqldelight/issues/1442
+            linkerOpts.add("-lsqlite3")
         }
     }
 

diff --git a/shared/core-di/build.gradle.kts b/shared/core-di/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
@@ -22,25 +21,23 @@ kotlin {
         browser()
     }
 
-    if (OperatingSystem.current().isMacOsX) {
-        listOf(
-            iosArm64(),
-            iosSimulatorArm64()
-        ).forEach {
-            it.binaries.framework {
-                baseName = "SharedDi"
-                isStatic = false
-                export(libs.settings)
-                export(projects.shared.coreApi)
-                export(projects.shared.coreDb)
-                export(projects.shared.core)
-                export(projects.shared.coreKvalue)
-                export(projects.shared.models)
-                export(projects.shared.uiModels)
-                export(projects.shared.resources)
-                // Required https://github.com/cashapp/sqldelight/issues/1442
-                linkerOpts.add("-lsqlite3")
-            }
+    listOf(
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "SharedDi"
+            isStatic = false
+            export(libs.settings)
+            export(projects.shared.coreApi)
+            export(projects.shared.coreDb)
+            export(projects.shared.core)
+            export(projects.shared.coreKvalue)
+            export(projects.shared.models)
+            export(projects.shared.uiModels)
+            export(projects.shared.resources)
+            // Required https://github.com/cashapp/sqldelight/issues/1442
+            linkerOpts.add("-lsqlite3")
         }
     }
 

diff --git a/shared/core-fs/build.gradle.kts b/shared/core-fs/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
@@ -20,15 +19,13 @@ kotlin {
         browser()
     }
 
-    if (OperatingSystem.current().isMacOsX) {
-        listOf(
-            iosArm64(),
-            iosSimulatorArm64()
-        ).forEach {
-            it.binaries.framework {
-                baseName = "SharedFs"
-                isStatic = false
-            }
+    listOf(
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "SharedFs"
+            isStatic = false
         }
     }
 

diff --git a/shared/core-kvalue/build.gradle.kts b/shared/core-kvalue/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
@@ -19,16 +18,14 @@ kotlin {
         browser()
     }
 
-    if (OperatingSystem.current().isMacOsX) {
-        listOf(
-            iosArm64(),
-            iosSimulatorArm64()
-        ).forEach {
-            it.binaries.framework {
-                baseName = "SharedKValue"
-                isStatic = false
-                export(libs.settings)
-            }
+    listOf(
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "SharedKValue"
+            isStatic = false
+            export(libs.settings)
         }
     }
 

diff --git a/shared/core/build.gradle.kts b/shared/core/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
@@ -23,25 +22,23 @@ kotlin {
         browser()
     }
 
-    if (OperatingSystem.current().isMacOsX) {
-        listOf(
-            iosArm64(),
-            iosSimulatorArm64()
-        ).forEach {
-            it.binaries.framework {
-                baseName = "Shared"
-                isStatic = false
-                export(libs.settings)
-                export(projects.shared.coreApi)
-                export(projects.shared.coreDb)
-                export(projects.shared.coreFs)
-                export(projects.shared.coreKvalue)
-                export(projects.shared.models)
-                export(projects.shared.uiModels)
-                export(projects.shared.resources)
-                // Required https://github.com/cashapp/sqldelight/issues/1442
-                linkerOpts.add("-lsqlite3")
-            }
+    listOf(
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "Shared"
+            isStatic = false
+            export(libs.settings)
+            export(projects.shared.coreApi)
+            export(projects.shared.coreDb)
+            export(projects.shared.coreFs)
+            export(projects.shared.coreKvalue)
+            export(projects.shared.models)
+            export(projects.shared.uiModels)
+            export(projects.shared.resources)
+            // Required https://github.com/cashapp/sqldelight/issues/1442
+            linkerOpts.add("-lsqlite3")
         }
     }
 

diff --git a/shared/models/build.gradle.kts b/shared/models/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
@@ -21,15 +20,13 @@ kotlin {
         browser()
     }
 
-    if (OperatingSystem.current().isMacOsX) {
-        listOf(
-            iosArm64(),
-            iosSimulatorArm64()
-        ).forEach {
-            it.binaries.framework {
-                baseName = "Models"
-                isStatic = false
-            }
+    listOf(
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "Models"
+            isStatic = false
         }
     }
 

diff --git a/shared/resources/build.gradle.kts b/shared/resources/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
@@ -14,15 +13,13 @@ android {
 kotlin {
     androidTarget()
 
-    if (OperatingSystem.current().isMacOsX) {
-        listOf(
-            iosArm64(),
-            iosSimulatorArm64()
-        ).forEach {
-            it.binaries.framework {
-                baseName = "Resources"
-                isStatic = false
-            }
+    listOf(
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "Resources"
+            isStatic = false
         }
     }
 

diff --git a/shared/ui-models/build.gradle.kts b/shared/ui-models/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
@@ -21,15 +20,13 @@ kotlin {
         browser()
     }
 
-    if (OperatingSystem.current().isMacOsX) {
-        listOf(
-            iosArm64(),
-            iosSimulatorArm64()
-        ).forEach {
-            it.binaries.framework {
-                baseName = "UiModels"
-                isStatic = false
-            }
+    listOf(
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "UiModels"
+            isStatic = false
         }
     }