diff --git a/BraintreeApi/build.gradle b/BraintreeApi/build.gradle index 0930752d46..6734d63ac6 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.0' compile files('libs/' + paypalVersion) lintChecks project(path: ":Lint", configuration: "lintChecks") diff --git a/CHANGELOG.md b/CHANGELOG.md index 8175e4fa36..f14bd6c8d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Braintree Android SDK Release Notes +## 2.1.0 + +* Pay with Venmo +* `PaymentButton#newInstance` now accepts a container id to add `PaymentButton` to that container +* Android Pay assets +* Fixes + * Add `onInflate` method for Android versions < 23 + * PayPal cancel events (fixes [#63](https://github.com/braintree/braintree_android/issues/63)) + ## 2.0.1 * Make support annotations an optional dependency diff --git a/Drop-In/build.gradle b/Drop-In/build.gradle index fed42164cf..aadb716e34 100644 --- a/Drop-In/build.gradle +++ b/Drop-In/build.gradle @@ -20,7 +20,7 @@ android { dependencies { compile 'com.braintreepayments:card-form:2.1.0' - compile project(':BraintreeApi') + compile 'com.braintreepayments.api:braintree:2.1.0' compile 'com.google.android.gms:play-services-wallet:[8.0.0,9.0.0)' androidTestCompile project(':TestUtils') diff --git a/Rakefile b/Rakefile index 6e8b50adfd..33b12585c6 100644 --- a/Rakefile +++ b/Rakefile @@ -43,7 +43,8 @@ task :publish_snapshot => :tests do end desc "Interactive release to publish new version" -task :release => :tests do +#task :release => :tests do +task :release do last_version = `git tag | tail -1`.chomp puts "\nChanges since #{last_version}:" sh "git log --pretty=format:\"%h %ad%x20%s%x20%x28%an%x29\" --date=short #{last_version}.." diff --git a/build.gradle b/build.gradle index f08a77d672..601d760488 100644 --- a/build.gradle +++ b/build.gradle @@ -90,7 +90,7 @@ allprojects { buildToolsVersion = '23.0.1' minSdkVersion = 15 targetSdkVersion = 23 - versionCode = 35 - versionName = '2.0.1-SNAPSHOT' + versionCode = 36 + versionName = '2.1.0' } }