From 0b044e9dc245dc2cc7c10873c4142e6f53b6a3f7 Mon Sep 17 00:00:00 2001
From: Georgi Christov <7644787+gchristov@users.noreply.github.com>
Date: Sun, 24 Mar 2024 08:13:47 +0100
Subject: [PATCH] Rename the multiplatform framework (#33)

---
 .github/workflows/check.yml             | 16 +++++++++++-----
 ios/app/NewsfeedApp.swift               |  2 +-
 ios/feed/feed/FeedScreen.swift          |  2 +-
 ios/feed/tests/FeedTestHostApp.swift    |  2 +-
 ios/post/post/PostScreen.swift          |  2 +-
 ios/post/tests/PostTestHostApp.swift    |  2 +-
 multiplatform/umbrella/build.gradle.kts |  4 ++--
 7 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index a8cc6d6..2b4be04 100644
--- 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
index dda51c1..1203625 100755
--- 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
index ca93846..3e6294a 100755
--- 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
index 4f45974..20b5059 100755
--- 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
index b7f0ba1..9a83233 100755
--- 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
index e7a8780..03ee1ca 100755
--- 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
index db1a22f..37f3417 100755
--- 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) }
         }