Add full Swift concurrency support with Sendable requirements (#92)

* Update the project to Swift 6 * Add full Swift concurrency support with Sendable requirements * Update packages * Update `CHANGELOG.md` * Update workflows * Fix the FlareCore unit tests * Update package * Update integration tests * Update integration tests * Update integration tests * Update `Package.swift` * Remove useless code and update `.swiftformat`
space-code · Dec 27, 2024 · dcca329 · dcca329
1 parent 8f6b827
commit dcca329
Show file tree

Hide file tree

Showing 68 changed files with 715 additions and 408 deletions.
diff --git a/.github/workflows/flare.yml b/.github/workflows/flare.yml
@@ -26,18 +26,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - xcode: "Xcode_16.0"
+            runsOn: macOS-14
+            name: "macOS 14, Xcode 16.0, Swift 6.0"
+          - xcode: "Xcode_15.4"
+            runsOn: macOS-14
+            name: "macOS 14, Xcode 15.4, Swift 5.10"
           - xcode: "Xcode_15.0"
             runsOn: macos-13
             name: "macOS 13, Xcode 15.0, Swift 5.9.0"
           - xcode: "Xcode_14.3.1"
             runsOn: macos-13
             name: "macOS 13, Xcode 14.3.1, Swift 5.8.0"
-          - xcode: "Xcode_14.2"
-            runsOn: macOS-12
-            name: "macOS 12, Xcode 14.2, Swift 5.7.2"
-          - xcode: "Xcode_14.1"
-            runsOn: macOS-12
-            name: "macOS 12, Xcode 14.1, Swift 5.7.1"
     steps:
       - uses: actions/checkout@v4
       - name: ${{ matrix.name }}
@@ -64,6 +64,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - destination: "OS=18.1,name=iPhone 16 Pro"
+            name: "iOS 18.1"
+            xcode: "Xcode_16.1"
+            runsOn: macOS-14
+          - destination: "OS=18.0,name=iPhone 16 Pro"
+            name: "iOS 18.0"
+            xcode: "Xcode_16.0"
+            runsOn: macOS-14
+          - destination: "OS=17.5,name=iPhone 15 Pro"
+            name: "iOS 17.5"
+            xcode: "Xcode_15.4"
+            runsOn: macOS-14
           - destination: "OS=17.0.1,name=iPhone 14 Pro"
             name: "iOS 17.0.1"
             xcode: "Xcode_15.0"
@@ -98,6 +110,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - destination: "OS=18.1,name=Apple TV"
+            name: "tvOS 18.1"
+            xcode: "Xcode_16.1"
+            runsOn: macOS-14
+          - destination: "OS=18.0,name=Apple TV"
+            name: "tvOS 18.0"
+            xcode: "Xcode_16.0"
+            runsOn: macOS-14
+          - destination: "OS=17.5,name=Apple TV"
+            name: "tvOS 17.5"
+            xcode: "Xcode_15.4"
+            runsOn: macOS-14
           - destination: "OS=17.0,name=Apple TV"
             name: "tvOS 17.0"
             xcode: "Xcode_15.0"
@@ -132,6 +156,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - destination: "OS=11.1,name=Apple Watch Series 10 (46mm)"
+            name: "watchOS 11.1"
+            xcode: "Xcode_16.1"
+            runsOn: macOS-14
+          - destination: "OS=11.0,name=Apple Watch Series 10 (46mm)"
+            name: "watchOS 11.0"
+            xcode: "Xcode_16.0"
+            runsOn: macOS-14
+          - destination: "OS=10.5,name=Apple Watch Series 9 (45mm)"
+            name: "watchOS 10.5"
+            xcode: "Xcode_15.4"
+            runsOn: macOS-14
           - destination: "OS=10.0,name=Apple Watch Series 9 (45mm)"
             name: "watchOS 10.0"
             xcode: "Xcode_15.0"
@@ -140,10 +176,6 @@ jobs:
             name: "watchOS 9.4"
             xcode: "Xcode_14.3.1"
             runsOn: macos-13
-          - destination: "OS=8.5,name=Apple Watch Series 7 (45mm)"
-            name: "watchOS 8.5"
-            xcode: "Xcode_14.3.1"
-            runsOn: macos-13
     steps:
       - uses: actions/checkout@v4
       - name: ${{ matrix.name }}
@@ -170,10 +202,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: "Xcode 15"
+          - name: "macOS 14, SPM 6.0.2 Test"
+            xcode: "Xcode_16.1"
+            runsOn: macOS-14
+          - name: "macOS 14, SPM 6.0.0 Test"
+            xcode: "Xcode_16.0"
+            runsOn: macOS-14
+          - name: "macOS 14, SPM 5.9.0 Test"
             xcode: "Xcode_15.0"
-            runsOn: macos-13
-          - name: "Xcode 14"
+            runsOn: macos-14
+          - name: "macOS 13, SPM 5.8.1 Test"
             xcode: "Xcode_14.3.1"
             runsOn: macos-13
     steps:
@@ -198,7 +236,7 @@ jobs:
 
   discover-typos:
     name: Discover Typos
-    runs-on: macOS-12
+    runs-on: macOS-13
     env:
       DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
     steps:

diff --git a/.github/workflows/flare_ui.yml b/.github/workflows/flare_ui.yml
@@ -26,18 +26,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - xcode: "Xcode_16.0"
+            runsOn: macOS-14
+            name: "macOS 14, Xcode 16.0, Swift 6.0"
+          - xcode: "Xcode_15.4"
+            runsOn: macOS-14
+            name: "macOS 14, Xcode 15.4, Swift 5.10"
           - xcode: "Xcode_15.0"
             runsOn: macos-13
             name: "macOS 13, Xcode 15.0, Swift 5.9.0"
           - xcode: "Xcode_14.3.1"
             runsOn: macos-13
             name: "macOS 13, Xcode 14.3.1, Swift 5.8.0"
-          - xcode: "Xcode_14.2"
-            runsOn: macOS-12
-            name: "macOS 12, Xcode 14.2, Swift 5.7.2"
-          - xcode: "Xcode_14.1"
-            runsOn: macOS-12
-            name: "macOS 12, Xcode 14.1, Swift 5.7.1"
     steps:
       - uses: actions/checkout@v4
       - name: ${{ matrix.name }}
@@ -64,6 +64,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - destination: "OS=18.1,name=iPhone 16 Pro"
+            name: "iOS 18.1"
+            xcode: "Xcode_16.1"
+            runsOn: macOS-14
+          - destination: "OS=18.0,name=iPhone 16 Pro"
+            name: "iOS 18.0"
+            xcode: "Xcode_16.0"
+            runsOn: macOS-14
+          - destination: "OS=17.5,name=iPhone 15 Pro"
+            name: "iOS 17.5"
+            xcode: "Xcode_15.4"
+            runsOn: macOS-14
           - destination: "OS=17.0.1,name=iPhone 14 Pro"
             name: "iOS 17.0.1"
             xcode: "Xcode_15.0"
@@ -98,6 +110,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - destination: "OS=18.1,name=Apple TV"
+            name: "tvOS 18.1"
+            xcode: "Xcode_16.1"
+            runsOn: macOS-14
+          - destination: "OS=18.0,name=Apple TV"
+            name: "tvOS 18.0"
+            xcode: "Xcode_16.0"
+            runsOn: macOS-14
+          - destination: "OS=17.5,name=Apple TV"
+            name: "tvOS 17.5"
+            xcode: "Xcode_15.4"
+            runsOn: macOS-14
           - destination: "OS=17.0,name=Apple TV"
             name: "tvOS 17.0"
             xcode: "Xcode_15.0"
@@ -132,6 +156,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - destination: "OS=11.1,name=Apple Watch Series 10 (46mm)"
+            name: "watchOS 11.1"
+            xcode: "Xcode_16.1"
+            runsOn: macOS-14
+          - destination: "OS=11.0,name=Apple Watch Series 10 (46mm)"
+            name: "watchOS 11.0"
+            xcode: "Xcode_16.0"
+            runsOn: macOS-14
+          - destination: "OS=10.5,name=Apple Watch Series 9 (45mm)"
+            name: "watchOS 10.5"
+            xcode: "Xcode_15.4"
+            runsOn: macOS-14
           - destination: "OS=10.0,name=Apple Watch Series 9 (45mm)"
             name: "watchOS 10.0"
             xcode: "Xcode_15.0"
@@ -140,10 +176,6 @@ jobs:
             name: "watchOS 9.4"
             xcode: "Xcode_14.3.1"
             runsOn: macos-13
-          - destination: "OS=8.5,name=Apple Watch Series 7 (45mm)"
-            name: "watchOS 8.5"
-            xcode: "Xcode_14.3.1"
-            runsOn: macos-13
     steps:
       - uses: actions/checkout@v4
       - name: ${{ matrix.name }}
@@ -170,10 +202,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: "Xcode 15"
+          - name: "macOS 14, SPM 6.0.2 Test"
+            xcode: "Xcode_16.1"
+            runsOn: macOS-14
+          - name: "macOS 14, SPM 6.0.0 Test"
+            xcode: "Xcode_16.0"
+            runsOn: macOS-14
+          - name: "macOS 14, SPM 5.9.0 Test"
             xcode: "Xcode_15.0"
-            runsOn: macos-13
-          - name: "Xcode 14"
+            runsOn: macos-14
+          - name: "macOS 13, SPM 5.8.1 Test"
             xcode: "Xcode_14.3.1"
             runsOn: macos-13
     steps:
@@ -236,7 +274,7 @@ jobs:
 
   discover-typos:
     name: Discover Typos
-    runs-on: macOS-12
+    runs-on: macOS-13
     env:
       DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
     steps:

diff --git a/.gitignore b/.gitignore
@@ -88,4 +88,5 @@ fastlane/test_output
 
 iOSInjectionProject/
 *.xcodeproj
-Example/
+Example/
+Package.resolved
diff --git a/.swiftformat b/.swiftformat
@@ -1,6 +1,6 @@
 # Stream rules
 
---swiftversion 5.3
+--swiftversion 5.7
 
 # Use 'swiftformat --options' to list all of the possible options
 
@@ -62,4 +62,4 @@
 
 --wraparguments before-first
 --wrapcollections before-first
---maxwidth 140
+--maxwidth 140
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -3,6 +3,8 @@ excluded:
   - Package.swift
   - [email protected]
   - [email protected]
+  - [email protected]
+  - [email protected]
   - Sources/Flare/Classes/Generated/Strings.swift
   - Sources/FlareUI/Classes/Generated/Strings.swift
   - Sources/FlareUI/Classes/Generated/Colors.swift

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 All notable changes to this project will be documented in this file.
 
 ## Added
+- Add full Swift concurrency support with Sendable requirements.
+  - Added in Pull Request [#92](https://github.com/space-code/flare/pull/92).
 - Implement locale for StoreProduct
   - Added in Pull Request [#82](https://github.com/space-code/flare/pull/82).
 

diff --git a/Package.resolved b/Package.resolved