fix privacy file conflict with swifterSwift in Xcode 16 (#1350)

* Update ci.yml * Update ci.yml * fix privacy file conflict with swifterSwift --------- Co-authored-by: Roman Podymov <[email protected]> Co-authored-by: Frank <[email protected]>
mxcl · Nov 3, 2024 · 2b265f6 · 2b265f6
1 parent 6fcc080
commit 2b265f6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ concurrency:
 
 jobs:
   linux:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         swift:
@@ -26,13 +26,13 @@ jobs:
     container:
       image: swift:${{ matrix.swift }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4.1.7
     - run: swift build -Xswiftc -warnings-as-errors -Xswiftc -swift-version -Xswiftc 3
     - run: swift build  # generated linuxmain requires Swift 5 sadly
 
   linux-code-cov:
     name: linux
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         swift:
@@ -46,7 +46,7 @@ jobs:
     container:
       image: swift:${{ matrix.swift }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4.1.7
     - run: swift build -Xswiftc -warnings-as-errors -Xswiftc -swift-version -Xswiftc 4
     - run: swift build -Xswiftc -warnings-as-errors -Xswiftc -swift-version -Xswiftc 4.2
     - run: swift test --enable-code-coverage --parallel
@@ -70,7 +70,7 @@ jobs:
     runs-on: macos-latest
     name: linux (validate manifests)
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4.1.7
     - run: swift test --generate-linuxmain
     - run: git diff --exit-code
 
@@ -86,7 +86,7 @@ jobs:
     - uses: maxim-lobanov/setup-xcode@v1
       with:
         xcode-version: 15.2
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4.1.7
     - uses: sersoft-gmbh/xcodebuild-action@v1
       with:
         project: PromiseKit.xcodeproj

diff --git a/PromiseKit.podspec b/PromiseKit.podspec
@@ -35,7 +35,7 @@ Pod::Spec.new do |s|
   }
 
   s.resource_bundles = {
-    'SwifterSwift_Privacy' => 'Sources/Resources/PrivacyInfo.xcprivacy'
+    'PromiseKit_Privacy' => 'Sources/Resources/PrivacyInfo.xcprivacy'
   }
 
   s.subspec 'Accounts' do |ss|