Update library to 2.6.0. Allow two-factor authentication.

paypal · Oct 27, 2014 · 17cf128 · 17cf128
1 parent 257f8b1
commit 17cf128
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 30 deletions.
diff --git a/PayPal-iOS-SDK.podspec b/PayPal-iOS-SDK.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name             = 'PayPal-iOS-SDK'
-  spec.version          = '2.5.0'
+  spec.version          = '2.6.0'
   spec.license          = { type: 'BSD', file: 'LICENSE.md' }
   spec.homepage         = 'https://developer.paypal.com/webapps/developer/docs/integration/mobile/mobile-sdk-overview/'
   spec.authors          = { 'PayPal' => 'support@paypal.com' }

diff --git a/PayPalMobile/PayPalConfiguration.h b/PayPalMobile/PayPalConfiguration.h
@@ -1,7 +1,7 @@
 //
 //  PayPalConfiguration.h
 //
-//  Version 2.5.0
+//  Version 2.6.0
 //
 //  Copyright (c) 2014, PayPal
 //  All rights reserved.

diff --git a/PayPalMobile/PayPalFuturePaymentViewController.h b/PayPalMobile/PayPalFuturePaymentViewController.h
@@ -1,7 +1,7 @@
 //
 //  PayPalFuturePaymentViewController.h
 //
-//  Version 2.5.0
+//  Version 2.6.0
 //
 //  Copyright (c) 2014, PayPal
 //  All rights reserved.

diff --git a/PayPalMobile/PayPalMobile.h b/PayPalMobile/PayPalMobile.h
@@ -1,7 +1,7 @@
 //
 //  PayPalMobile.h
 //
-//  Version 2.5.0
+//  Version 2.6.0
 //
 //  Copyright (c) 2014, PayPal
 //  All rights reserved.

diff --git a/PayPalMobile/PayPalOAuthScopes.h b/PayPalMobile/PayPalOAuthScopes.h
@@ -1,7 +1,7 @@
 //
 //  PayPalOAuthScopes.h
 //
-//  Version 2.5.0
+//  Version 2.6.0
 //
 //  Copyright (c) 2014, PayPal
 //  All rights reserved.

diff --git a/PayPalMobile/PayPalPayment.h b/PayPalMobile/PayPalPayment.h
@@ -1,7 +1,7 @@
 //
 //  PayPalPayment.h
 //
-//  Version 2.5.0
+//  Version 2.6.0
 //
 //  Copyright (c) 2014, PayPal
 //  All rights reserved.

diff --git a/PayPalMobile/PayPalPaymentViewController.h b/PayPalMobile/PayPalPaymentViewController.h
@@ -1,7 +1,7 @@
 //
 //  PayPalPaymentViewController.h
 //
-//  Version 2.5.0
+//  Version 2.6.0
 //
 //  Copyright (c) 2014, PayPal
 //  All rights reserved.

diff --git a/PayPalMobile/PayPalProfileSharingViewController.h b/PayPalMobile/PayPalProfileSharingViewController.h
@@ -1,7 +1,7 @@
 //
 //  PayPalProfileSharingViewController.h
 //
-//  Version 2.5.0
+//  Version 2.6.0
 //
 //  Copyright (c) 2014, PayPal
 //  All rights reserved.

diff --git a/PayPalMobile/libPayPalMobile.a b/PayPalMobile/libPayPalMobile.a
diff --git a/README.md b/README.md
@@ -58,7 +58,7 @@ Your customer logs in to PayPal and consents to PayPal sharing information with
 
 ## Requirements
 
-* Xcode 5 and iOS SDK 7
+* Xcode 6 and iOS SDK 8
 * iOS 6.0+ target deployment
 * armv7, armv7s, and arm64 devices, and the simulator (not armv6)
 * iPhone and iPad of all sizes and resolutions

diff --git a/SampleApp/PayPal-iOS-SDK-Sample-App.xcodeproj/project.pbxproj b/SampleApp/PayPal-iOS-SDK-Sample-App.xcodeproj/project.pbxproj
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		2D48B18616EE8F0800C83CD2 /* check.png in Resources */ = {isa = PBXBuildFile; fileRef = 2D48B18416EE8F0800C83CD2 /* check.png */; };
 		2D48B18716EE8F0800C83CD2 /* check@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2D48B18516EE8F0800C83CD2 /* check@2x.png */; };
+		3EC3966819FEBCA20044C28F /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 849BE73316D440B200E03EEC /* MobileCoreServices.framework */; };
 		3ED93D8119C7814400478314 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 849BE6EF16D4352100E03EEC /* CoreGraphics.framework */; };
 		849BE6EC16D4352100E03EEC /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 849BE6EB16D4352100E03EEC /* UIKit.framework */; };
 		849BE6EE16D4352100E03EEC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 849BE6ED16D4352100E03EEC /* Foundation.framework */; };
@@ -30,7 +31,6 @@
 		849BE74216D440D700E03EEC /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 849BE73016D440B100E03EEC /* CoreVideo.framework */; };
 		849BE74316D440D700E03EEC /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 849BE73116D440B100E03EEC /* libxml2.dylib */; };
 		849BE74416D440D700E03EEC /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 849BE73216D440B100E03EEC /* MessageUI.framework */; };
-		849BE74516D440D700E03EEC /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 849BE73316D440B200E03EEC /* MobileCoreServices.framework */; };
 		849BE74616D440D700E03EEC /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 849BE73416D440B200E03EEC /* OpenGLES.framework */; };
 		849BE74716D440D700E03EEC /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 849BE73516D440B200E03EEC /* QuartzCore.framework */; };
 		849BE74816D440D700E03EEC /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 849BE73616D440B200E03EEC /* Security.framework */; };
@@ -106,7 +106,7 @@
 				849BE74216D440D700E03EEC /* CoreVideo.framework in Frameworks */,
 				849BE6EE16D4352100E03EEC /* Foundation.framework in Frameworks */,
 				849BE74416D440D700E03EEC /* MessageUI.framework in Frameworks */,
-				849BE74516D440D700E03EEC /* MobileCoreServices.framework in Frameworks */,
+				3EC3966819FEBCA20044C28F /* MobileCoreServices.framework in Frameworks */,
 				849BE74616D440D700E03EEC /* OpenGLES.framework in Frameworks */,
 				849BE74716D440D700E03EEC /* QuartzCore.framework in Frameworks */,
 				849BE74816D440D700E03EEC /* Security.framework in Frameworks */,
@@ -248,7 +248,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = ZZ;
-				LastUpgradeCheck = 0460;
+				LastUpgradeCheck = 0610;
 				ORGANIZATIONNAME = PayPal;
 			};
 			buildConfigurationList = 849BE6E316D4352000E03EEC /* Build configuration list for PBXProject "PayPal-iOS-SDK-Sample-App" */;
@@ -340,7 +340,9 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_MODULES_AUTOLINK = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
@@ -372,7 +374,9 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_MODULES_AUTOLINK = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
@@ -385,6 +389,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";

diff --git a/SampleApp/PayPal-iOS-SDK-Sample-App/PayPal-iOS-SDK-Sample-App-Info.plist b/SampleApp/PayPal-iOS-SDK-Sample-App/PayPal-iOS-SDK-Sample-App-Info.plist
@@ -30,11 +30,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.0</string>
+	<string>2.6.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.5.0</string>
+	<string>2.6.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>
@@ -72,17 +72,3 @@
 	</array>
 </dict>
 </plist>
-</plist>
-</plist>
-plist>
-plist>
-st>
-st>
-st>
-st>
-st>
-st>
-st>
-st>
-st>
-st>
diff --git a/docs/future_payments_server.md b/docs/future_payments_server.md
@@ -57,7 +57,7 @@ Note that all returned code and token values should be considered variable lengt
 ```bash
 curl 'https://api.paypal.com/v1/oauth2/token' \
     -H "Content-Type: application/x-www-form-urlencoded" \
-    -H "Authorization: Basic QWZV...==" \
+    -u "client_id:secret" \
     -d 'grant_type=authorization_code&response_type=token&redirect_uri=urn:ietf:wg:oauth:2.0:oob&code=EBYhRW3ncivudQn8UopLp4A28...'
 ```
 

diff --git a/docs/profile_sharing_server.md b/docs/profile_sharing_server.md
@@ -57,7 +57,7 @@ Note that all returned code and token values should be considered variable lengt
 ```bash
 curl 'https://api.paypal.com/v1/oauth2/token' \
     -H "Content-Type: application/x-www-form-urlencoded" \
-    -H "Authorization: Basic QWZV...==" \
+    -u "client_id:secret" \
     -d 'grant_type=authorization_code&response_type=token&redirect_uri=urn:ietf:wg:oauth:2.0:oob&code=EBYhRW3ncivudQn8UopLp4A28...'
 ```
 

diff --git a/release_notes.md b/release_notes.md
@@ -1,6 +1,13 @@
 PayPal iOS SDK release notes
 ============================
 
+2.6.0
+-----
+* Allow login by users who have enabled two-factor authentication on their PayPal accounts.
+* Streamline Profile Sharing for cases where a user has previously authorized sharing.
+* Prevent a "duplicate symbol" problem for apps that are also integrating with 1Password.
+* Minor bug fixes.
+
 2.5.0
 -----
 * NOTE: version 2.5.0 requires Xcode 6 and iOS 8 SDK. If you are still using Xcode 5, please use version 2.3.2 of this SDK.