Release 2.15.0

paypal · Sep 16, 2016 · 41d132d · 41d132d
1 parent c27fa5b
commit 41d132d
Show file tree

Hide file tree

Showing 21 changed files with 71 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 PayPal iOS SDK release notes
 ============================
 
+2.15.0
+------
+* Update to card.io 5.4.0 to help avoid API name collisions [#456](https://github.com/paypal/PayPal-iOS-SDK/issues/456).
+
 2.14.7
 ------
 * Fix issue with localization not being correctly merged based on preferences [#449](https://github.com/paypal/PayPal-iOS-SDK/issues/449).

diff --git a/CardIO/CardIO.h b/CardIO/CardIO.h
@@ -1,6 +1,6 @@
 //
 //  CardIO.h
-//  Version 5.3.2
+//  Version 5.4.0
 //
 //  See the file "LICENSE.md" for the full license governing this code.
 //

diff --git a/CardIO/CardIO.m b/CardIO/CardIO.m
@@ -0,0 +1,7 @@
+//
+// This file exists so that CocoaPods will generate a modulemap for CardIO
+//
+// See https://github.com/card-io/card.io-iOS-SDK/issues/115
+// and https://github.com/card-io/card.io-iOS-SDK/pull/126
+// for more details
+//
diff --git a/CardIO/CardIOCreditCardInfo.h b/CardIO/CardIOCreditCardInfo.h
@@ -1,6 +1,6 @@
 //
 //  CardIOCreditCardInfo.h
-//  Version 5.3.2
+//  Version 5.4.0
 //
 //  See the file "LICENSE.md" for the full license governing this code.
 //

diff --git a/CardIO/CardIODetectionMode.h b/CardIO/CardIODetectionMode.h
@@ -1,6 +1,6 @@
 //
 //  CardIODetectionMode.h
-//  Version 5.3.2
+//  Version 5.4.0
 //
 //  See the file "LICENSE.md" for the full license governing this code.
 //