Rename the multiplatform framework (#33)

gchristov · Mar 24, 2024 · 0b044e9 · 0b044e9
1 parent 41d48db
commit 0b044e9
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 12 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -88,8 +88,11 @@ jobs:
       - name: Set up Xcode version
         run: sudo xcode-select -s /Applications/Xcode_${{ env.XCODE_VERSION }}.app
       - name: Set up Xcode
-        uses: mikehardy/buildcache-action@v2
-      - name: Compile iOS app
+        uses: irgaly/xcode-cache@v1
+        with:
+          key: ios-check-build-${{ github.workflow }}-${{ github.sha }}
+          restore-keys: ios-check-build-${{ github.workflow }}-
+      - name: Compile iOS appp
         run: |
           cd ios &&
           set -o pipefail && 
@@ -102,8 +105,8 @@ jobs:
           name: iOS Build
           path: |
             ios/xcodebuild.log
-            ~/Library/**/app.app
-            ~/Library/**/app.app.dSYM
+            ~/Library/Developer/Xcode/DerivedData/**/*.app
+            ~/Library/Developer/Xcode/DerivedData/**/*.app.dSYM
             **/build
             **/secrets.properties
 
@@ -134,7 +137,10 @@ jobs:
       - name: Set up Xcode version
         run: sudo xcode-select -s /Applications/Xcode_${{ env.XCODE_VERSION }}.app
       - name: Set up Xcode
-        uses: mikehardy/buildcache-action@v2
+        uses: irgaly/xcode-cache@v1
+        with:
+          key: ios-check-test-${{ github.workflow }}-${{ github.sha }}
+          restore-keys: ios-check-test-${{ github.workflow }}-
       - name: iOS tests
         run: |
           cd ios &&

diff --git a/ios/app/NewsfeedApp.swift b/ios/app/NewsfeedApp.swift
@@ -1,7 +1,7 @@
 import SwiftUI
 import CommonSwiftUi
 import Feed
-import KmmShared
+import NewsfeedMultiplatform
 
 /**
  Entry point of the app.

diff --git a/ios/feed/feed/FeedScreen.swift b/ios/feed/feed/FeedScreen.swift
@@ -1,5 +1,5 @@
 import SwiftUI
-import KmmShared
+import NewsfeedMultiplatform
 import Post
 import CommonSwiftUi
 

diff --git a/ios/feed/tests/FeedTestHostApp.swift b/ios/feed/tests/FeedTestHostApp.swift
@@ -1,7 +1,7 @@
 import SwiftUI
 import CommonSwiftUi
 import Feed
-import KmmShared
+import NewsfeedMultiplatform
 
 /*
  App to setup and run the UI tests for this module using a launch environment

diff --git a/ios/post/post/PostScreen.swift b/ios/post/post/PostScreen.swift
@@ -1,5 +1,5 @@
 import SwiftUI
-import KmmShared
+import NewsfeedMultiplatform
 import CommonSwiftUi
 
 public struct PostScreen: View {

diff --git a/ios/post/tests/PostTestHostApp.swift b/ios/post/tests/PostTestHostApp.swift
@@ -1,7 +1,7 @@
 import SwiftUI
 import CommonSwiftUi
 import Post
-import KmmShared
+import NewsfeedMultiplatform
 
 /*
  App to setup and run the UI tests for this module using a launch environment

diff --git a/multiplatform/umbrella/build.gradle.kts b/multiplatform/umbrella/build.gradle.kts
@@ -33,10 +33,10 @@ kotlin {
         iosSimulatorArm64()
     ).forEach {
         it.binaries.framework {
-            baseName = "KmmShared"
+            baseName = "NewsfeedMultiplatform"
             // Both dynamic frameworks and -lsqlite3 are required for SQLDelight, otherwise we get linker errors
             // TODO: Adding -lsqlite3 to Other Linked Flags in Xcode fixes the issue and we can use a static lib then
-            freeCompilerArgs = freeCompilerArgs + arrayOf("-linker-options", "-lsqlite3")
+            linkerOpts("-lsqlite3")
             isStatic = false
             exportedDependencies.forEach { dependency -> export(dependency) }
         }