Skip to content

Commit

Permalink
Merge branch 'main' into resource_bundle_sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
richherrera committed Apr 24, 2024
2 parents b429eb7 + 21abe58 commit 093a437
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
steps:
- name: Check out repository
uses: actions/checkout@v2
- name: Use Xcode 14
run: sudo xcode-select -switch /Applications/Xcode_14.2.app
- name: Use Xcode 15.1
run: sudo xcode-select -switch /Applications/Xcode_15.1.app
- name: Install SwiftLint
run: brew install swiftlint
- name: Run SwiftLint
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
# PayPal iOS SDK Release Notes

## unreleased
* PayPalNativePayments
* Bump `PayPalCheckout` to `1.3.0` with code signing & a privacy manifest file
* PaymentButtons
* Resolve assets not rendering when importing via CocoaPods (fixes #267)

Expand Down
2 changes: 1 addition & 1 deletion Demo/Demo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@
repositoryURL = "https://github.com/paypal/paypalcheckout-ios";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.2.0;
minimumVersion = 1.3.0;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ let package = Package(
),
.binaryTarget(
name: "PayPalCheckout",
url: "https://github.com/paypal/paypalcheckout-ios/releases/download/1.2.0/PayPalCheckout.xcframework.zip",
checksum: "de177ea050cfd342aa1bbfe0d9ed7faf8262270a0291a5862b6ee3c7f85cc1ff"
url: "https://github.com/paypal/paypalcheckout-ios/releases/download/1.3.0/PayPalCheckout.xcframework.zip",
checksum: "d65186f38f390cb9ae0431ecacf726774f7f89f5474c48244a07d17b248aa035"
)
]
)
2 changes: 1 addition & 1 deletion PayPal.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Pod::Spec.new do |s|
s.subspec "PayPalNativePayments" do |s|
s.source_files = "Sources/PayPalNativePayments/**/*.swift"
s.dependency "PayPal/CorePayments"
s.dependency "PayPalCheckout", "1.2.0"
s.dependency "PayPalCheckout", "1.3.0"
s.resource_bundle = { "PayPalNativePayments_PrivacyInfo" => "Sources/PayPalNativePayments/PrivacyInfo.xcprivacy" }
end

Expand Down
2 changes: 1 addition & 1 deletion PayPal.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3469,7 +3469,7 @@
repositoryURL = "https://github.com/paypal/paypalcheckout-ios";
requirement = {
kind = exactVersion;
version = 1.2.0;
version = 1.3.0;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down

0 comments on commit 093a437

Please sign in to comment.