feat(multiplatform): add iOS targets to build configurations

Extended build configurations to include iosArm64 and iosSimulatorArm64 targets across multiple modules, enhancing iOS platform support for the Kotlin Multiplatform Mobile (KMM) projects.
tddworks · Jan 9, 2025 · 7d063e6 · 7d063e6
1 parent a9d5c4b
commit 7d063e6
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 33 deletions.
diff --git a/anthropic-client/anthropic-client-core/build.gradle.kts b/anthropic-client/anthropic-client-core/build.gradle.kts
@@ -7,7 +7,8 @@ plugins {
 kotlin {
     jvm()
     macosArm64()
-    macosX64()
+    iosArm64()
+    iosSimulatorArm64()
 
     sourceSets {
         commonMain.dependencies {

diff --git a/anthropic-client/anthropic-client-darwin/build.gradle.kts b/anthropic-client/anthropic-client-darwin/build.gradle.kts
@@ -8,7 +8,8 @@ plugins {
 kotlin {
     listOf(
         macosArm64(),
-        macosX64()
+        iosArm64(),
+        iosSimulatorArm64()
     ).forEach { macosTarget ->
         macosTarget.binaries.framework {
             baseName = "anthropic-client-darwin"
@@ -36,14 +37,16 @@ kmmbridge {
      * In kmmbridge, notice mavenPublishArtifacts() tells the plugin to push KMMBridge artifacts to a Maven repo. You then need to define a repo. Rather than do everything manually, you can just call addGithubPackagesRepository(), which will add the correct repo given parameters that are passed in from GitHub Actions.
      */
     mavenPublishArtifacts() // <- Publish using a Maven repo
-//    spm {
-//        swiftToolsVersion = "5.9"
-//        platforms {
-//            iOS("14")
-//            macOS("13")
-//            watchOS("7")
-//            tvOS("14")
-//        }
-//    }
+    /**
+     * https://github.com/touchlab/KMMBridge/issues/258
+     */
+    spm(
+        swiftToolVersion = "5.9",
+        useCustomPackageFile = true,
+        perModuleVariablesBlock = true
+    ) {
+        iOS { v("18") }
+        macOS { v("15") }
+    }
 }
 
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -7,7 +7,8 @@ plugins {
 kotlin {
     jvm()
     macosArm64()
-    macosX64()
+    iosArm64()
+    iosSimulatorArm64()
 
     sourceSets {
         commonMain.dependencies {

diff --git a/gemini-client/gemini-client-core/build.gradle.kts b/gemini-client/gemini-client-core/build.gradle.kts
@@ -10,8 +10,9 @@ plugins {
 
 kotlin {
     jvm()
+    iosArm64()
+    iosSimulatorArm64()
     macosArm64()
-    macosX64()
 
     sourceSets {
         commonMain {

diff --git a/gemini-client/gemini-client-darwin/build.gradle.kts b/gemini-client/gemini-client-darwin/build.gradle.kts
@@ -8,11 +8,12 @@ plugins {
 kotlin {
     listOf(
         macosArm64(),
-        macosX64()
+        iosArm64(),
+        iosSimulatorArm64()
     ).forEach { macosTarget ->
         macosTarget.binaries.framework {
-            baseName = "gemini-client-darwin"
             export(projects.geminiClient.geminiClientCore)
+            baseName = "geminiClientDarwin"
             isStatic = true
         }
     }
@@ -30,20 +31,22 @@ kotlin {
 
 addGithubPackagesRepository() // <- Add the GitHub Packages repo
 
+
 kmmbridge {
     /**
      * reference: https://kmmbridge.touchlab.co/docs/artifacts/MAVEN_REPO_ARTIFACTS#github-packages
      * In kmmbridge, notice mavenPublishArtifacts() tells the plugin to push KMMBridge artifacts to a Maven repo. You then need to define a repo. Rather than do everything manually, you can just call addGithubPackagesRepository(), which will add the correct repo given parameters that are passed in from GitHub Actions.
      */
     mavenPublishArtifacts() // <- Publish using a Maven repo
-//    spm(swiftToolVersion = "5.9")
-//    spm {
-//        swiftToolsVersion = "5.9"
-//        platforms {
-//            iOS("14")
-//            macOS("13")
-//            watchOS("7")
-//            tvOS("14")
-//        }
-//    }
-}
+    /**
+     * https://github.com/touchlab/KMMBridge/issues/258
+     */
+    spm(
+        swiftToolVersion = "5.9",
+//        useCustomPackageFile = true,
+//        perModuleVariablesBlock = true
+    ) {
+        iOS { v("15") }
+//        macOS { v("15") }
+    }
+}
diff --git a/ollama-client/ollama-client-core/build.gradle.kts b/ollama-client/ollama-client-core/build.gradle.kts
@@ -7,7 +7,8 @@ plugins {
 kotlin {
     jvm()
     macosArm64()
-    macosX64()
+    iosArm64()
+    iosSimulatorArm64()
 
     sourceSets {
         commonMain.dependencies {

diff --git a/ollama-client/ollama-client-darwin/build.gradle.kts b/ollama-client/ollama-client-darwin/build.gradle.kts
@@ -8,7 +8,8 @@ plugins {
 kotlin {
     listOf(
         macosArm64(),
-        macosX64()
+        iosArm64(),
+        iosSimulatorArm64()
     ).forEach { macosTarget ->
         macosTarget.binaries.framework {
             baseName = "ollama-client-darwin"

diff --git a/openai-client/openai-client-core/build.gradle.kts b/openai-client/openai-client-core/build.gradle.kts
@@ -7,8 +7,8 @@ plugins {
 kotlin {
     jvm()
     macosArm64()
-    macosX64()
-
+    iosArm64()
+    iosSimulatorArm64()
     sourceSets {
         commonMain.dependencies {
             // put your Multiplatform dependencies here

diff --git a/openai-client/openai-client-darwin/build.gradle.kts b/openai-client/openai-client-darwin/build.gradle.kts
@@ -8,7 +8,8 @@ plugins {
 kotlin {
     listOf(
         macosArm64(),
-        macosX64()
+        iosArm64(),
+        iosSimulatorArm64()
     ).forEach { macosTarget ->
         macosTarget.binaries.framework {
             baseName = "openai-client-darwin"

diff --git a/openai-gateway/openai-gateway-core/build.gradle.kts b/openai-gateway/openai-gateway-core/build.gradle.kts
@@ -7,7 +7,8 @@ plugins {
 kotlin {
     jvm()
     macosArm64()
-    macosX64()
+    iosArm64()
+    iosSimulatorArm64()
 
     sourceSets {
         commonMain.dependencies {

diff --git a/openai-gateway/openai-gateway-darwin/build.gradle.kts b/openai-gateway/openai-gateway-darwin/build.gradle.kts
@@ -8,7 +8,8 @@ plugins {
 kotlin {
     listOf(
         macosArm64(),
-        macosX64()
+        iosArm64(),
+        iosSimulatorArm64()
     ).forEach { macosTarget ->
         macosTarget.binaries.framework {
             baseName = "openai-gateway-darwin"