Xcode 12.5 - Fix SPM binary dependency explicit requirement

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## unreleased
 * Re-add `BraintreeCore` dependency to `PayPalDataCollector` for Swift Package Manager archive issue workaround (fixes #679)
+* Remove SPM product libraries for `KountDataCollector` and `PPRiskMagnes` (this was a workaround for an Xcode bug discussed in #576; bug resolved in Xcode 12.5)
 
 ## 5.4.0 (2021-06-07)
 * Venmo
@@ -746,7 +747,7 @@ As always, feel free to [open an Issue](https://github.com/braintree/braintree_i
 * Fix bug in Demo app
   * Menu button now works correctly
 * Fix bug with PayPal app switching
-  * The bug occurred when installing a new app after the Braintree SDK had been initialized. When attempting to authorize with PayPal in this scenario, the SDK would switch to the `wallet` and launch the `in-app` authorization. 
+  * The bug occurred when installing a new app after the Braintree SDK had been initialized. When attempting to authorize with PayPal in this scenario, the SDK would switch to the `wallet` and launch the `in-app` authorization.
 
 ## 3.8.1 (2015-05-22)
 
@@ -837,11 +838,11 @@ As always, feel free to [open an Issue](https://github.com/braintree/braintree_i
 * Update PayPal Mobile SDK to new version (PayPal-iOS-SDK 2.8.4-bt1) that does not include card.io.
   * :rotating_light: Please note! :rotating_light:  
 
-      This change breaks builds that depend on a workaround introduced in 3.4.0 that added card.io headers to fix [card.io duplicate symbol issues](https://github.com/braintree/braintree_ios/issues/53). 
+      This change breaks builds that depend on a workaround introduced in 3.4.0 that added card.io headers to fix [card.io duplicate symbol issues](https://github.com/braintree/braintree_ios/issues/53).
 
-      Since card.io is not officially part of the Braintree API, and since the headers were only included as part of a workaround for use by a small group of developers, this potentially-breaking change is not accompanied by a major version release. 
+      Since card.io is not officially part of the Braintree API, and since the headers were only included as part of a workaround for use by a small group of developers, this potentially-breaking change is not accompanied by a major version release.
 
-      If your build breaks due to this change, you can re-add card.io to your project's Podfile: 
+      If your build breaks due to this change, you can re-add card.io to your project's Podfile:
 
           pod 'CardIO', '~> 4.0'
 
@@ -897,7 +898,7 @@ As always, feel free to [open an Issue](https://github.com/braintree/braintree_i
 
 * Upgrade PayPal Mobile SDK to version 2.7.1
   * Fixes symbol conflicts with 1Password
-  * Upgrades embedded card.io library to version 3.10.1 
+  * Upgrades embedded card.io library to version 3.10.1
 
 ## 3.4.1 (2014-11-05)
 
@@ -967,7 +968,7 @@ As always, feel free to [open an Issue](https://github.com/braintree/braintree_i
   * Test improvements
   * Internal API tweaks
   * Update PayPal implementation to always support PayPal display email/phone across client and server
-    * Your PayPal app (client ID) must now have the email scope capability. This is default for Braintree-provisioned PayPal apps. 
+    * Your PayPal app (client ID) must now have the email scope capability. This is default for Braintree-provisioned PayPal apps.
   * Improved Braintree-Demo app that demonstrates many integration styles
   * Upgraded underlying PayPal Mobile SDK
 

Package.swift

@@ -25,7 +25,7 @@ let package = Package(
         ),
         .library(
             name: "BraintreeDataCollector",
-            targets: ["BraintreeDataCollector"]
+            targets: ["BraintreeDataCollector", "KountDataCollector"]
         ),
         .library(
             name: "BraintreePaymentFlow",
@@ -37,11 +37,7 @@ let package = Package(
         ),
         .library(
             name: "BraintreeThreeDSecure",
-            targets: ["BraintreeThreeDSecure"]
-        ),
-        .library(
-            name: "CardinalMobile",
-            targets: ["CardinalMobile"]
+            targets: ["BraintreeThreeDSecure", "CardinalMobile"]
         ),
         .library(
             name: "BraintreeUnionPay",
@@ -51,17 +47,9 @@ let package = Package(
             name: "BraintreeVenmo",
             targets: ["BraintreeVenmo"]
         ),
-        .library(
-            name: "KountDataCollector",
-            targets: ["KountDataCollector"]
-        ),
         .library(
             name: "PayPalDataCollector",
-            targets: ["PayPalDataCollector"]
-        ),
-        .library(
-            name: "PPRiskMagnes",
-            targets: ["PPRiskMagnes"]
+            targets: ["PayPalDataCollector", "PPRiskMagnes"]
         )
     ],
     dependencies: [

README.md

@@ -28,7 +28,20 @@ We recommend using [Swift Package Manager](https://swift.org/package-manager/),
 ### Swift Package Manager
 _This feature is only available in v5._
 
-See our [Swift Package Manager guide](https://github.com/braintree/braintree_ios/blob/master/SWIFT_PACKAGE_MANAGER.md) for instructions on integrating with SPM.
+To add the `Braintree` package to your Xcode project, select _File > Swift Packages > Add Package Dependency_ and enter `https://github.com/braintree/braintree_ios` as the repository URL. Tick the checkboxes for the specific Braintree libraries you wish to include.
+
+If you look at your app target, you will see that the Braintree libraries you chose are automatically linked as a frameworks to your app (see _General > Frameworks, Libraries, and Embedded Content_).
+
+In your app's source code files, use the following import syntax to include Braintree's libraries:
+```
+import BraintreeCore
+import BraintreeCard
+import BraintreeApplePay
+import BraintreePayPal
+```
+
+**Braintree 5.X.0 requires Xcode 12.5+ for SPM.** We recommend using the latest version for the simplest SPM integration. If using Braintree 5.X.0 and below, please see our [Swift Package Manager guide](https://github.com/braintree/braintree_ios/blob/master/SPM_BUGFIX_GUIDE.md) for specific workarounds required to use these older versions.
+
 
 ### CocoaPods
 ```

SWIFT_PACKAGE_MANAGER.md

@@ -1,28 +1,15 @@
-# Swift Package Manager Instructions
+# Swift Package Manager Instructions (for Braintree 5.0.0 to 5.X.0)
 
-Support for Swift Package Manager was introduced in Braintree iOS v5.
+It is recommended to update to Braintree 5.X.0+ and Xcode 12.5 for the best SPM experience.
 
-* [General Instructions](#general-instructions)
 * [Binary Dependencies](#binary-dependencies)
 * [BraintreeDataCollector](#braintreedatacollector)
 * [BraintreeThreeDSecure](#braintreethreedsecure)
 
-### General Instructions
-
-To add the `Braintree` package to your Xcode project, select _File > Swift Packages > Add Package Dependency_ and enter `https://github.com/braintree/braintree_ios` as the repository URL. Tick the checkboxes for the specific Braintree libraries you wish to include.
-
-If you look at your app target, you will see that the Braintree libraries you chose are automatically linked as a frameworks to your app (see _General > Frameworks, Libraries, and Embedded Content_).
-
-In your app's source code files, use the following import syntax to include Braintree's libraries:
-```
-import BraintreeCore
-import BraintreeCard
-import BraintreeApplePay
-import BraintreePayPal
-```
-
 ### Binary Dependencies
 
+#### Versions 5.0.0 to 5.X.0
+
 There is a known Xcode bug, reported in [this GitHub issue](https://github.com/braintree/braintree_ios/issues/576), that occurs when archiving apps that include binary dependencies via SPM. The workaround is to tick the checkboxes to explicitly include these binary dependencies in your app.
 
 To use the `BraintreeDataCollector` library, you must also check the box for `KountDataCollector`.
@@ -35,6 +22,8 @@ If your app uses app extensions, there is a [known SPM issue](https://forums.swi
 
 ### BraintreeDataCollector
 
+#### Versions 5.0.0 to 5.X.0
+
 There is a [known bug](https://forums.swift.org/t/packaging-static-library-in-spm-package-for-ios-executable/41245/13) that occurs when uploading static libraries packaged as xcframeworks for Swift Package Manager. To avoid this issue, you must add a post-action to your scheme's Build section that removes an extra copy of `libKountDataCollector.a`.
 
 
@@ -48,7 +37,7 @@ Make sure to select your app's target in the _Provide build settings from_ drop-
 
 ### BraintreeThreeDSecure
 
-#### Versions 5.3.0+
+#### Versions 5.3.0 to 5.X.0
 
 If you are using `BraintreeThreeDSecure`, you must also explicitly include `CardinalMobile` and `PPRiskMagnes`, both of which can be included through SPM.