Fix building errors

.github/workflows/ci.yml

@@ -37,19 +37,22 @@ jobs:
           - xcode: "Xcode_15.0"
             runsOn: macos-13
             name: "macOS 13, Xcode 15.0, Swift 5.9.0"
+            params: "-skipMacroValidation"
           - xcode: "Xcode_14.3.1"
             runsOn: macos-13
             name: "macOS 13, Xcode 14.3.1, Swift 5.8.0"
+            params: ""
           - 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"
+            params: ""
     steps:
       - uses: actions/checkout@v3
       - name: ${{ matrix.name }}
-        run: xcodebuild test -scheme "Blade-Package" -destination "platform=macOS" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1
+        run: xcodebuild test -scheme "Blade-Package" -destination "platform=macOS" clean -enableCodeCoverage YES ${{ matrix.params }} -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1
       - name: Upload coverage reports to Codecov
         uses: codecov/[email protected]
         with:
@@ -74,14 +77,16 @@ jobs:
             name: "iOS 17.0.1"
             xcode: "Xcode_15.0"
             runsOn: macos-13
+            params: "-skipMacroValidation"
           - destination: "OS=16.4,name=iPhone 14 Pro"
             name: "iOS 16.4"
             xcode: "Xcode_14.3.1"
             runsOn: macos-13
+            params: ""
     steps:
       - uses: actions/checkout@v3
       - name: ${{ matrix.name }}
-        run: xcodebuild test -scheme "Blade-Package" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1
+        run: xcodebuild test -scheme "Blade-Package" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES ${{ matrix.params }} -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1
       - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.name }}
@@ -100,14 +105,16 @@ jobs:
             name: "tvOS 17.0"
             xcode: "Xcode_15.0"
             runsOn: macos-13
+            params: "-skipMacroValidation"
           - destination: "OS=16.4,name=Apple TV"
             name: "tvOS 16.4"
             xcode: "Xcode_14.3.1"
             runsOn: macos-13
+            params: ""
     steps:
       - uses: actions/checkout@v3
       - name: ${{ matrix.name }}
-        run: xcodebuild test -scheme "Blade-Package" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1
+        run: xcodebuild test -scheme "Blade-Package" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES ${{ matrix.params }} -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1
       - name: Upload coverage reports to Codecov
         uses: codecov/[email protected]
         with:
@@ -132,18 +139,21 @@ jobs:
             name: "watchOS 10.0"
             xcode: "Xcode_15.0"
             runsOn: macos-13
+            params: "-skipMacroValidation"
           - destination: "OS=9.4,name=Apple Watch Series 8 (45mm)"
             name: "watchOS 9.4"
             xcode: "Xcode_14.3.1"
             runsOn: macos-13
+            params: ""
           - destination: "OS=8.5,name=Apple Watch Series 7 (45mm)"
             name: "watchOS 8.5"
             xcode: "Xcode_14.3.1"
             runsOn: macos-13
+            params: ""
     steps:
       - uses: actions/checkout@v3
       - name: ${{ matrix.name }}
-        run: xcodebuild test -scheme "Blade-Package" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1
+        run: xcodebuild test -scheme "Blade-Package" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES ${{ matrix.params }} -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1
       - name: Upload coverage reports to Codecov
         uses: codecov/[email protected]
         with:
@@ -173,7 +183,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: ${{ matrix.name }}
-        run: swift build -c release --target "Blade-Package"
+        run: |
+          swift build -c release --target "Blade"
+          swift build -c release --target "BladeTCA"
 
   merge-test-reports:
     needs: [iOS, macOS, watchOS, tvOS]

CONTRIBUTING.md

@@ -58,4 +58,4 @@ See [CODE_OF_CONDUCT.md](https://github.com/space-code/blade/blob/master/CODE_OF
 
 ---
 
-*Some of the ideas and wording for the statements above were based on work by the [Docker](https://github.com/docker/docker/blob/master/CONTRIBUTING.md) and [Linux](https://elinux.org/Developer_Certificate_Of_Origin) communities. We commend them for their efforts to facilitate collaboration in their projects.*
+*Some of the ideas and wording for the statements above were based on work by the [Docker](https://github.com/docker/docker/blob/master/CONTRIBUTING.md) and [Linux](https://elinux.org/Developer_Certificate_Of_Origin) communities.

Sources/Blade/Classes/Models/Page.swift

@@ -20,7 +20,7 @@ public struct Page<T: Equatable>: Equatable {
     /// the current page.
     public let hasMoreData: Bool
 
-    // MARK: Initializaiton
+    // MARK: Initialization
 
     /// Creates a `Page` instance.
     ///

Sources/BladeTCA/Classes/Presentation/ViewModifiers/LoadingViewModifier.swift

@@ -17,8 +17,17 @@ struct LoadingViewModifier: ViewModifier {
             content
 
             if isLoading {
-                ProgressView().progressViewStyle(.circular)
+                progressView
             }
         }
     }
+
+    // MARK: Private
+
+    private var progressView: some View {
+        if #available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *) {
+            return ProgressView().progressViewStyle(.circular)
+        }
+        return EmptyView()
+    }
 }