From 83f62f2179d4099b1ffdd5511ea8210cd632ceb0 Mon Sep 17 00:00:00 2001 From: 417-72KI <417.72ki@gmail.com> Date: Thu, 4 Jul 2024 02:39:46 +0900 Subject: [PATCH 1/3] fix deployment target in podspec --- BuildConfig.swift.podspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BuildConfig.swift.podspec b/BuildConfig.swift.podspec index f799be9..e875786 100644 --- a/BuildConfig.swift.podspec +++ b/BuildConfig.swift.podspec @@ -13,10 +13,10 @@ Pod::Spec.new do |s| s.author = { "417.72KI" => "417.72ki@gmail.com" } 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 From bf086b15d6abe50b52c5646174abafb0f7e9fcb2 Mon Sep 17 00:00:00 2001 From: 417-72KI <417.72ki@gmail.com> Date: Thu, 4 Jul 2024 02:40:00 +0900 Subject: [PATCH 2/3] add available for watchOS, tvOS --- .../Sources/BuildConfigSwiftDemo/Repository/APIClient.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DemoWithPackage/Sources/BuildConfigSwiftDemo/Repository/APIClient.swift b/DemoWithPackage/Sources/BuildConfigSwiftDemo/Repository/APIClient.swift index f776370..8321619 100644 --- 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) From 2859e9527067d34de386bdac76f27722e786fa5a Mon Sep 17 00:00:00 2001 From: 417-72KI <417.72ki@gmail.com> Date: Thu, 4 Jul 2024 02:55:03 +0900 Subject: [PATCH 3/3] fix cache keys --- .github/workflows/ci.yml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e43184c..45dcf70 100644 --- 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