Merge pull request #20 from mori-atsushi/ios-simulator

Add iOS simulator support
mori-atsushi · May 6, 2023 · bc681fc · bc681fc
2 parents b9dc0c2 + 652ec5f
commit bc681fc
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -81,7 +81,7 @@ jobs:
 
       - name: Run local tests
         run: |
-          ./gradlew uikitX64Test
+          ./gradlew uikitX64Test uikitSimArm64Test
 
       - name: Upload test reports
         if: always()

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation("com.moriatsushi.insetsx:insetsx:0.1.0-alpha03")
+                implementation("com.moriatsushi.insetsx:insetsx:0.1.0-alpha04")
             }
         }
     }

diff --git a/example/build.gradle.kts b/example/build.gradle.kts
@@ -8,21 +8,12 @@ plugins {
 
 kotlin {
     android()
-    iosX64("uikitX64") {
-        binaries {
-            executable {
-                entryPoint = "main"
-                freeCompilerArgs += listOf(
-                    "-linker-option", "-framework", "-linker-option", "Metal",
-                    "-linker-option", "-framework", "-linker-option", "CoreText",
-                    "-linker-option", "-framework", "-linker-option", "CoreGraphics",
-                    "-Xverify-compiler=false", // Workaround for https://youtrack.jetbrains.com/issue/KT-53561
-                )
-            }
-        }
-    }
-    iosArm64("uikitArm64") {
-        binaries {
+    listOf(
+        iosX64("uikitX64"),
+        iosArm64("uikitArm64"),
+        iosSimulatorArm64("uikitSimArm64")
+    ).forEach {
+        it.binaries {
             executable {
                 entryPoint = "main"
                 freeCompilerArgs += listOf(
@@ -65,6 +56,9 @@ kotlin {
         val uikitArm64Main by getting {
             dependsOn(uikitMain)
         }
+        val uikitSimArm64Main by getting {
+            dependsOn(uikitMain)
+        }
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -22,7 +22,7 @@ org.jetbrains.compose.experimental.uikit.enabled=true
 SONATYPE_HOST=S01
 RELEASE_SIGNING_ENABLED=true
 GROUP=com.moriatsushi.insetsx
-VERSION_NAME=0.1.0-alpha03
+VERSION_NAME=0.1.0-alpha04
 
 POM_NAME=InsetsX
 POM_DESCRIPTION=WindowInsets utility for compose multiplatform

diff --git a/insetsx/build.gradle.kts b/insetsx/build.gradle.kts
@@ -13,6 +13,7 @@ kotlin {
     listOf(
         iosX64("uikitX64"),
         iosArm64("uikitArm64"),
+        iosSimulatorArm64("uikitSimArm64")
     ).forEach {
         it.binaries.framework {
             baseName = "insetsx"
@@ -45,6 +46,9 @@ kotlin {
         val uikitArm64Main by getting {
             dependsOn(uikitMain)
         }
+        val uikitSimArm64Main by getting {
+            dependsOn(uikitMain)
+        }
         val uikitTest by creating {
             dependsOn(commonMain)
         }