Release 2.6.0

paypal · Oct 21, 2014 · 50ecb9f · 50ecb9f
1 parent d4610ca
commit 50ecb9f
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 2 deletions.
diff --git a/SampleApp/AndroidManifest.xml b/SampleApp/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="17" />
+        android:targetSdkVersion="21" />
 
     <!-- for card.io card scanning -->
     <uses-permission android:name="android.permission.CAMERA" />

diff --git a/SampleApp/libs/PayPalAndroidSDK-2.5.6.jar → SampleApp/libs/PayPalAndroidSDK-2.6.0.jar b/SampleApp/libs/PayPalAndroidSDK-2.5.6.jar → SampleApp/libs/PayPalAndroidSDK-2.6.0.jar
diff --git a/SampleApp/project.properties b/SampleApp/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-21
diff --git a/docs/ja/README.md b/docs/ja/README.md
diff --git a/docs/ja/future_payment_error_codes.md b/docs/ja/future_payment_error_codes.md
diff --git a/docs/ja/future_payments_mobile.md b/docs/ja/future_payments_mobile.md
diff --git a/docs/ja/future_payments_server.md b/docs/ja/future_payments_server.md
diff --git a/docs/ja/profile_sharing_mobile.md b/docs/ja/profile_sharing_mobile.md
diff --git a/docs/ja/profile_sharing_server.md b/docs/ja/profile_sharing_server.md
diff --git a/docs/ja/single_payment.md b/docs/ja/single_payment.md
diff --git a/docs/profile_sharing_mobile.md b/docs/profile_sharing_mobile.md
@@ -56,6 +56,7 @@ The sample app provides a more complete example. However, at minimum, you must:
     <service android:name="com.paypal.android.sdk.payments.PayPalService"
             android:exported="false" />
 
+    <activity android:name="com.paypal.android.sdk.payments.FuturePaymentInfoActivity" />
     <activity android:name="com.paypal.android.sdk.payments.LoginActivity" />
     <activity android:name="com.paypal.android.sdk.payments.PayPalProfileSharingActivity" />
     <activity android:name="com.paypal.android.sdk.payments.ProfileSharingConsentActivity" />

diff --git a/docs/profile_sharing_server.md b/docs/profile_sharing_server.md
diff --git a/libs/PayPalAndroidSDK-2.5.6.jar → libs/PayPalAndroidSDK-2.6.0.jar b/libs/PayPalAndroidSDK-2.5.6.jar → libs/PayPalAndroidSDK-2.6.0.jar
diff --git a/release_notes.md b/release_notes.md
@@ -1,6 +1,13 @@
 PayPal Android SDK release notes
 ================================
 
+2.6.0
+-----
+* Do not show consent screen if the requested scope has already been consented.
+* Update card.io library to 3.2.0.
+* Update all targets to android-21.
+* Minor bug fixes.
+
 2.5.6
 -----
 * Minor bug fixes.