Skip to content
This repository has been archived by the owner on Jun 11, 2021. It is now read-only.

Commit

Permalink
Release 2.14.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Brateman committed Sep 6, 2016
1 parent 0c17ae6 commit 62f77b5
Show file tree
Hide file tree
Showing 18 changed files with 51 additions and 48 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
PayPal Android SDK release notes
================================

2.14.5
------
* Update okhttp dependency to 3.4.1.
* Fix crash when app does not have READ_PHONE_STATE permission [#321](https://github.com/paypal/PayPal-Android-SDK/issues/321).

2.14.4
------
* Minor bug fixes.
Expand Down
52 changes: 25 additions & 27 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ The PayPal Android SDK makes it easy to add PayPal and credit card payments to m
The PayPal Android SDK is now available at [Maven Repository](https://repo1.maven.org/maven2/com/paypal/sdk/paypal-android-sdk/). The latest version is available via `mavenCentral()`:

```groovy
compile 'com.paypal.sdk:paypal-android-sdk:2.14.4'
compile 'com.paypal.sdk:paypal-android-sdk:2.14.5'
```


Expand Down Expand Up @@ -131,31 +131,29 @@ If your app initiates a transaction with a currency that turns out to be unsuppo

Future payments does not require card.io card scanning. Also, for single payments, if you do not wish to include the scanning feature of card.io, and only allow manual entry by keyboard, add packagingOptions to remove the `.so` libraries of card.io in your `build.gradle`:
```groovy
android {
packagingOptions {
exclude 'lib/arm64-v8a/libcardioDecider.so'
exclude 'lib/arm64-v8a/libcardioRecognizer.so'
exclude 'lib/arm64-v8a/libcardioRecognizer_tegra2.so'
exclude 'lib/arm64-v8a/libopencv_core.so'
exclude 'lib/arm64-v8a/libopencv_imgproc.so'
exclude 'lib/armeabi/libcardioDecider.so'
exclude 'lib/armeabi-v7a/libcardioDecider.so'
exclude 'lib/armeabi-v7a/libcardioRecognizer.so'
exclude 'lib/armeabi-v7a/libcardioRecognizer_tegra2.so'
exclude 'lib/armeabi-v7a/libopencv_core.so'
exclude 'lib/armeabi-v7a/libopencv_imgproc.so'
exclude 'lib/mips/libcardioDecider.so'
exclude 'lib/x86/libcardioDecider.so'
exclude 'lib/x86/libcardioRecognizer.so'
exclude 'lib/x86/libcardioRecognizer_tegra2.so'
exclude 'lib/x86/libopencv_core.so'
exclude 'lib/x86/libopencv_imgproc.so'
exclude 'lib/x86_64/libcardioDecider.so'
exclude 'lib/x86_64/libcardioRecognizer.so'
exclude 'lib/x86_64/libcardioRecognizer_tegra2.so'
exclude 'lib/x86_64/libopencv_core.so'
exclude 'lib/x86_64/libopencv_imgproc.so'
}
packagingOptions {
exclude 'lib/arm64-v8a/libcardioDecider.so'
exclude 'lib/arm64-v8a/libcardioRecognizer.so'
exclude 'lib/arm64-v8a/libcardioRecognizer_tegra2.so'
exclude 'lib/arm64-v8a/libopencv_core.so'
exclude 'lib/arm64-v8a/libopencv_imgproc.so'
exclude 'lib/armeabi/libcardioDecider.so'
exclude 'lib/armeabi-v7a/libcardioDecider.so'
exclude 'lib/armeabi-v7a/libcardioRecognizer.so'
exclude 'lib/armeabi-v7a/libcardioRecognizer_tegra2.so'
exclude 'lib/armeabi-v7a/libopencv_core.so'
exclude 'lib/armeabi-v7a/libopencv_imgproc.so'
exclude 'lib/mips/libcardioDecider.so'
exclude 'lib/x86/libcardioDecider.so'
exclude 'lib/x86/libcardioRecognizer.so'
exclude 'lib/x86/libcardioRecognizer_tegra2.so'
exclude 'lib/x86/libopencv_core.so'
exclude 'lib/x86/libopencv_imgproc.so'
exclude 'lib/x86_64/libcardioDecider.so'
exclude 'lib/x86_64/libcardioRecognizer.so'
exclude 'lib/x86_64/libcardioRecognizer_tegra2.so'
exclude 'lib/x86_64/libopencv_core.so'
exclude 'lib/x86_64/libopencv_imgproc.so'
}
```

Expand All @@ -164,7 +162,7 @@ android {
If you want to completely disable Direct Credit Card (DCC) payments, exclude the card.io library in your application `build.gradle`:
```groovy
dependencies {
compile('com.paypal.sdk:paypal-android-sdk:2.14.4') {
compile('com.paypal.sdk:paypal-android-sdk:2.14.5') {
exclude group: 'io.card'
}
}
Expand Down
8 changes: 4 additions & 4 deletions SampleApp-Kotlin/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 23
buildToolsVersion '23.0.2'
compileSdkVersion 24
buildToolsVersion '24.0.1'

defaultConfig {
minSdkVersion 18
targetSdkVersion 23
targetSdkVersion 24
}

signingConfigs {
Expand Down Expand Up @@ -78,7 +78,7 @@ dependencies {
if (parent != null) {
compile project(path: ':androidSDK')
} else {
compile('com.paypal.sdk:paypal-android-sdk:2.14.4')
compile('com.paypal.sdk:paypal-android-sdk:2.14.5')
}
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
Expand Down
2 changes: 1 addition & 1 deletion SampleApp-Kotlin/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@

</application>

</manifest>
</manifest>
2 changes: 1 addition & 1 deletion SampleApp-Kotlin/src/main/res/values-sw600dp/dimens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
screen margins) for sw600dp devices (e.g. 7" tablets) here.
-->

</resources>
</resources>
2 changes: 1 addition & 1 deletion SampleApp-Kotlin/src/main/res/values-sw720dp-land/dimens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
-->
<dimen name="activity_horizontal_margin">128dp</dimen>

</resources>
</resources>
2 changes: 1 addition & 1 deletion SampleApp-Kotlin/src/main/res/values/dimens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
<resources>
<dimen name="activity_horizontal_margin">10dip</dimen>
<dimen name="activity_vertical_margin">10dip</dimen>
</resources>
</resources>
2 changes: 1 addition & 1 deletion SampleApp-Kotlin/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

<string name="app_name">PayPal SDK Example</string>

</resources>
</resources>
10 changes: 5 additions & 5 deletions SampleApp/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ repositories {
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion '23.0.2'
compileSdkVersion 24
buildToolsVersion '24.0.1'

defaultConfig {
minSdkVersion 18
targetSdkVersion 23
targetSdkVersion 24
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
}

Expand Down Expand Up @@ -78,7 +78,7 @@ android {
}

configurations.all {
resolutionStrategy.force 'com.android.support:support-annotations:23.0.1'
resolutionStrategy.force 'com.android.support:support-annotations:24.0.0'
}


Expand All @@ -87,7 +87,7 @@ dependencies {
generalCompile project(path: ':androidSDK', configuration: 'generalDebug')
partnerCompile project(path: ':androidSDK', configuration: 'partnerDebug')
} else {
compile('com.paypal.sdk:paypal-android-sdk:2.14.4')
compile('com.paypal.sdk:paypal-android-sdk:2.14.5')
}
compile 'com.google.android.gms:play-services-wallet:8.4.0'

Expand Down
2 changes: 1 addition & 1 deletion ...App/src/androidTest/java/com/paypal/example/paypalandroidsdkexample/test/PaymentTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ public void profileSharingConsent() {
onDeviceWithScreenShot(withTextStartingWith("Result :")).check(text(containsString("Profile Sharing code")));
}

}
}
2 changes: 1 addition & 1 deletion ...eApp/src/androidTest/java/com/paypal/example/paypalandroidsdkexample/test/TestHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,4 @@ public static void onAgree() {
// This may mean, he has already agreed to it before.
}
}
}
}
2 changes: 1 addition & 1 deletion SampleApp/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@

</application>

</manifest>
</manifest>
2 changes: 1 addition & 1 deletion SampleApp/src/main/res/values-sw600dp/dimens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
screen margins) for sw600dp devices (e.g. 7" tablets) here.
-->

</resources>
</resources>
2 changes: 1 addition & 1 deletion SampleApp/src/main/res/values-sw720dp-land/dimens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
-->
<dimen name="activity_horizontal_margin">128dp</dimen>

</resources>
</resources>
2 changes: 1 addition & 1 deletion SampleApp/src/main/res/values/dimens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
<resources>
<dimen name="activity_horizontal_margin">10dip</dimen>
<dimen name="activity_vertical_margin">10dip</dimen>
</resources>
</resources>
2 changes: 1 addition & 1 deletion SampleApp/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

<string name="app_name">PayPal SDK Example</string>

</resources>
</resources>
Binary file removed aars/PayPalAndroidSDK-2.14.4.aar
View file
Binary file not shown.
Binary file added aars/PayPalAndroidSDK-2.14.5.aar
View file
Binary file not shown.

0 comments on commit 62f77b5

Please sign in to comment.