Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix privacy file conflict with swifterSwift in Xcode 16 #1350

Merged
merged 3 commits into from
Nov 3, 2024
Merged

fix privacy file conflict with swifterSwift in Xcode 16 #1350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3514dc
Update ci.yml
RomanPodymov Sep 18, 2024
1cdebef
Update ci.yml
RomanPodymov Sep 18, 2024
315d4c4
fix privacy file conflict with swifterSwift
notrobpike Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ concurrency:

jobs:
linux:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
matrix:
swift:
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion PromiseKit.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand Down
Loading