Skip to content

Commit

Permalink
Release 2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
quinnjn committed Dec 8, 2015
1 parent 254c1e7 commit 823bbce
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 5 deletions.
2 changes: 1 addition & 1 deletion BraintreeApi/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Drop-In/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
3 changes: 2 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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}.."
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

0 comments on commit 823bbce

Please sign in to comment.