added support to iosSimulator64Arm platform (#108)

Co-authored-by: Alberto Caliman <[email protected]>
dellisd · May 26, 2023 · 1120560 · 1120560
1 parent 76e0e93
commit 1120560
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 6 deletions.
diff --git a/geojson/build.gradle.kts b/geojson/build.gradle.kts
@@ -29,7 +29,9 @@ kotlin {
     }
     mingwX64("mingw")
     macosX64("macos")
-    ios("ios")
+    iosArm64()
+    iosX64()
+    iosSimulatorArm64()
 
     sourceSets {
         all {
@@ -60,13 +62,11 @@ kotlin {
 
         val nativeMain by getting {
             getByName("macosMain").dependsOn(this)
-            getByName("iosMain").dependsOn(this)
             getByName("mingwMain").dependsOn(this)
         }
 
         val nativeTest by getting {
             getByName("macosTest").dependsOn(this)
-            getByName("iosTest").dependsOn(this)
             getByName("mingwTest").dependsOn(this)
         }
 
@@ -91,6 +91,26 @@ kotlin {
             dependsOn(commonBench)
             dependsOn(nativeMain)
         }
+
+        val iosX64Main by getting
+        val iosArm64Main by getting
+        val iosSimulatorArm64Main by getting
+        val iosMain by creating {
+            dependsOn(nativeMain)
+            iosX64Main.dependsOn(this)
+            iosArm64Main.dependsOn(this)
+            iosSimulatorArm64Main.dependsOn(this)
+        }
+
+        val iosX64Test by getting
+        val iosArm64Test by getting
+        val iosSimulatorArm64Test by getting
+        val iosTest by creating {
+            dependsOn(nativeTest)
+            iosX64Test.dependsOn(this)
+            iosArm64Test.dependsOn(this)
+            iosSimulatorArm64Test.dependsOn(this)
+        }
     }
 }
 

diff --git a/turf/build.gradle.kts b/turf/build.gradle.kts
@@ -21,7 +21,9 @@ kotlin {
     linuxX64("native")
     mingwX64("mingw")
     macosX64("macos")
-    ios("ios")
+    iosArm64()
+    iosX64()
+    iosSimulatorArm64()
 
     sourceSets["commonMain"].dependencies {
         api(project(":geojson"))
@@ -53,13 +55,29 @@ kotlin {
     sourceSets {
         val nativeMain by getting {}
         getByName("macosMain").dependsOn(nativeMain)
-        getByName("iosMain").dependsOn(nativeMain)
         getByName("mingwMain").dependsOn(nativeMain)
+        val iosX64Main by getting
+        val iosArm64Main by getting
+        val iosSimulatorArm64Main by getting
+        val iosMain by creating {
+            dependsOn(nativeMain)
+            iosX64Main.dependsOn(this)
+            iosArm64Main.dependsOn(this)
+            iosSimulatorArm64Main.dependsOn(this)
+        }
 
         val nativeTest by getting {}
         getByName("macosTest").dependsOn(nativeTest)
-        getByName("iosTest").dependsOn(nativeTest)
         getByName("mingwTest").dependsOn(nativeTest)
+        val iosX64Test by getting
+        val iosArm64Test by getting
+        val iosSimulatorArm64Test by getting
+        val iosTest by creating {
+            dependsOn(nativeTest)
+            iosX64Test.dependsOn(this)
+            iosArm64Test.dependsOn(this)
+            iosSimulatorArm64Test.dependsOn(this)
+        }
 
         all {
             with(languageSettings) {