diff --git a/BraintreeApi/build.gradle b/BraintreeApi/build.gradle index 46cc9c0f52..2d3f8ba2ea 100644 --- a/BraintreeApi/build.gradle +++ b/BraintreeApi/build.gradle @@ -29,7 +29,7 @@ dependencies { compile 'com.google.android.gms:play-services-wallet:[8.0.0,9.0.0)' compile 'com.android.support:support-annotations:[23.0.0,24.0.0)' - compile project(':BraintreeDataCollector') + compile 'com.braintreepayments.api:data-collector:2.1.1' compile files('libs/' + paypalVersion) lintChecks project(path: ":Lint", configuration: "lintChecks") diff --git a/CHANGELOG.md b/CHANGELOG.md index f14bd6c8d1..6831d5029e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Braintree Android SDK Release Notes +## 2.1.1 + +* Demo app upgrades +* Update PayPal SDK to 2.4.3 (fixes [#67](https://github.com/braintree/braintree_android/issues/67)) +* Update android-card-form to 2.1.1 +* Update gradle to 2.8 +* Update build tools to 23.0.2 +* Features + * Add support for fraud data collection in Drop-in +* Fixes + * Add rule to suppress ProGuard warnings + * Fix Drop-in crash + * Fix NPE when there is no active network (fixes [#77](https://github.com/braintree/braintree_android/issues/77)) + ## 2.1.0 * Pay with Venmo diff --git a/Drop-In/build.gradle b/Drop-In/build.gradle index 8010395b14..ff5eb0965f 100644 --- a/Drop-In/build.gradle +++ b/Drop-In/build.gradle @@ -20,7 +20,7 @@ android { dependencies { compile 'com.braintreepayments:card-form:2.1.1' - compile project(':BraintreeApi') + compile 'com.braintreepayments.api:braintree:2.1.1' compile 'com.google.android.gms:play-services-wallet:[8.0.0,9.0.0)' androidTestCompile project(':TestUtils') diff --git a/build.gradle b/build.gradle index 0785ae8bae..69209f8888 100644 --- a/build.gradle +++ b/build.gradle @@ -90,7 +90,7 @@ allprojects { buildToolsVersion = '23.0.2' minSdkVersion = 15 targetSdkVersion = 23 - versionCode = 36 - versionName = '2.1.0-SNAPSHOT' + versionCode = 37 + versionName = '2.1.1' } }