Skip to content

Commit

Permalink
resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
agedd committed Mar 6, 2024
2 parents 8c567f2 + fe31f15 commit ff4ed7e
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 1 deletion.
1 change: 1 addition & 0 deletions Braintree.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ Pod::Spec.new do |s|
s.subspec "SEPADirectDebit" do |s|
s.source_files = "Sources/BraintreeSEPADirectDebit/*.swift"
s.dependency "Braintree/Core"
s.resource_bundle = { "BraintreeSEPADirectDebit_PrivacyInfo" => "Sources/BraintreeSEPADirectDebit/PrivacyInfo.xcprivacy" }
end

s.subspec "PayPalNativeCheckout" do |s|
Expand Down
3 changes: 2 additions & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ let package = Package(
.target(
name: "BraintreeSEPADirectDebit",
dependencies: ["BraintreeCore"],
path: "Sources/BraintreeSEPADirectDebit"
path: "Sources/BraintreeSEPADirectDebit",
resources: [.copy("PrivacyInfo.xcprivacy")]
),
.target(
name: "BraintreeThreeDSecure",
Expand Down
45 changes: 45 additions & 0 deletions Sources/BraintreeSEPADirectDebit/PrivacyInfo.xcprivacy
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSPrivacyCollectedDataTypes</key>
<array>
<dict>
<key>NSPrivacyCollectedDataType</key>
<string>NSPrivacyCollectedDataTypePhysicalAddress</string>
<key>NSPrivacyCollectedDataTypeLinked</key>
<false/>
<key>NSPrivacyCollectedDataTypeTracking</key>
<false/>
<key>NSPrivacyCollectedDataTypePurposes</key>
<array>
<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
</array>
</dict>
<dict>
<key>NSPrivacyCollectedDataType</key>
<string>NSPrivacyCollectedDataTypePaymentInfo</string>
<key>NSPrivacyCollectedDataTypeLinked</key>
<false/>
<key>NSPrivacyCollectedDataTypeTracking</key>
<false/>
<key>NSPrivacyCollectedDataTypePurposes</key>
<array>
<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
</array>
</dict>
<dict>
<key>NSPrivacyCollectedDataType</key>
<string>NSPrivacyCollectedDataTypeName</string>
<key>NSPrivacyCollectedDataTypeLinked</key>
<false/>
<key>NSPrivacyCollectedDataTypeTracking</key>
<false/>
<key>NSPrivacyCollectedDataTypePurposes</key>
<array>
<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
</array>
</dict>
</array>
</dict>
</plist>

0 comments on commit ff4ed7e

Please sign in to comment.