Merge pull request #102 from 417-72KI/fix-deployment-target-for-cocoa…

…pods Fix deployment target for CocoaPods
417-72KI · Jul 3, 2024 · 1da3121 · 1da3121
2 parents f53968d + 2859e95
commit 1da3121
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,9 +39,10 @@ jobs:
           cache-name: swiftpm
         with:
           path: .build
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/Package.swift') }}
+          key: ${{ runner.os }}-${{ github.job }}-${{ matrix.xcode_version }}-${{ env.cache-name }}-${{ hashFiles('**/Package.swift') }}
           restore-keys: |
-            ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ github.job }}-${{ matrix.xcode_version }}-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ github.job }}-${{ matrix.xcode_version }}-
             ${{ runner.os }}-${{ github.job }}-
             ${{ runner.os }}-
       - name: Disable SwiftLint Plugin
@@ -73,9 +74,10 @@ jobs:
           path: |
             Demo/.build
             Demo/Tools/.build
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/Package.swift') }}
+          key: ${{ runner.os }}-${{ github.job }}-${{ matrix.xcode_version }}-${{ env.cache-name }}-${{ hashFiles('**/Package.swift') }}
           restore-keys: |
-            ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ github.job }}-${{ matrix.xcode_version }}-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ github.job }}-${{ matrix.xcode_version }}-
             ${{ runner.os }}-${{ github.job }}-
             ${{ runner.os }}-
       - name: Cache DerivedData
@@ -84,9 +86,10 @@ jobs:
           cache-name: derived-data
         with:
           path: Demo/DerivedData
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/Package.swift') }}
+          key: ${{ runner.os }}-${{ github.job }}-${{ matrix.xcode_version }}-${{ env.cache-name }}-${{ hashFiles('**/Package.swift') }}
           restore-keys: |
-            ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ github.job }}-${{ matrix.xcode_version }}-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ github.job }}-${{ matrix.xcode_version }}-
             ${{ runner.os }}-${{ github.job }}-
             ${{ runner.os }}-
       - name: Disable SwiftLint Plugin
@@ -118,9 +121,10 @@ jobs:
           path: |
             DemoWithPackage/.build
             DemoWithPackage/Tools/.build
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/Package.swift') }}
+          key: ${{ runner.os }}-${{ github.job }}-${{ matrix.xcode_version }}-${{ env.cache-name }}-${{ hashFiles('**/Package.swift') }}
           restore-keys: |
-            ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ github.job }}-${{ matrix.xcode_version }}-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ github.job }}-${{ matrix.xcode_version }}-
             ${{ runner.os }}-${{ github.job }}-
             ${{ runner.os }}-
       - name: Cache DerivedData
@@ -129,9 +133,10 @@ jobs:
           cache-name: derived-data
         with:
           path: DemoWithPackage/DerivedData
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/Package.swift') }}
+          key: ${{ runner.os }}-${{ github.job }}-${{ matrix.xcode_version }}-${{ env.cache-name }}-${{ hashFiles('**/Package.swift') }}
           restore-keys: |
-            ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ github.job }}-${{ matrix.xcode_version }}-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ github.job }}-${{ matrix.xcode_version }}-
             ${{ runner.os }}-${{ github.job }}-
             ${{ runner.os }}-
       - name: Disable SwiftLint Plugin

diff --git a/BuildConfig.swift.podspec b/BuildConfig.swift.podspec
@@ -13,10 +13,10 @@ Pod::Spec.new do |s|
   s.author             = { "417.72KI" => "[email protected]" }
   s.social_media_url   = "http://twitter.com/417_72ki"
 
-  s.ios.deployment_target = "10.0"
-  s.osx.deployment_target = "10.9"
-  s.watchos.deployment_target = "3.0"
-  s.tvos.deployment_target = "10.0"
+  s.ios.deployment_target = "15.0"
+  s.osx.deployment_target = "12.0"
+  s.watchos.deployment_target = "8.0"
+  s.tvos.deployment_target = "15.0"
 
   s.requires_arc = true
 

diff --git a/DemoWithPackage/Sources/BuildConfigSwiftDemo/Repository/APIClient.swift b/DemoWithPackage/Sources/BuildConfigSwiftDemo/Repository/APIClient.swift
@@ -46,7 +46,7 @@ extension APIClient {
         return try decoder.decode(LoginResponse.self, from: data)
     }
 
-    @available(iOS 16.0, *)
+    @available(iOS 16.0, watchOS 9.0, tvOS 16.0, *)
     func search(_ text: String) async throws -> SearchResponse {
         let endpoint = endpoint(\.search)
         let url = host.appendingPathComponent(endpoint.path)