Release 2.2.5

braintree · Apr 14, 2016 · b94979c · b94979c
1 parent fa74dd6
commit b94979c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 2 deletions.
diff --git a/BraintreeDataCollector/build.gradle b/BraintreeDataCollector/build.gradle
@@ -27,6 +27,7 @@ dependencies {
 task javadocs(type: Javadoc) {
     source = android.sourceSets.main.java.srcDirs
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    failOnError false
 }
 
 task javadocsJar(type: Jar, dependsOn: javadocs) {

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Braintree Android SDK Release Notes
 
+## 2.2.5
+
+* Fixes
+  * Update BraintreeHttpClient to support UTF-8 encoding (fixes [#85](https://github.com/braintree/braintree_android/issues/85))
+
 ## 2.2.4
 
 * Update PayPalDataCollector to 3.1.1

diff --git a/Core/build.gradle b/Core/build.gradle
@@ -28,6 +28,7 @@ dependencies {
 task javadocs(type: Javadoc) {
     source = android.sourceSets.main.java.srcDirs
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    failOnError false
 }
 
 task javadocsJar(type: Jar, dependsOn: javadocs) {

diff --git a/PayPalDataCollector/build.gradle b/PayPalDataCollector/build.gradle
@@ -32,6 +32,7 @@ dependencies {
 task javadocs(type: Javadoc) {
     source = android.sourceSets.main.java.srcDirs
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    failOnError false
 }
 
 task javadocsJar(type: Jar, dependsOn: javadocs) {

diff --git a/PayPalOneTouch/build.gradle b/PayPalOneTouch/build.gradle
@@ -48,6 +48,7 @@ dependencies {
 task javadocs(type: Javadoc) {
     source = android.sourceSets.main.java.srcDirs
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    failOnError false
 }
 
 task javadocsJar(type: Jar, dependsOn: javadocs) {

diff --git a/build.gradle b/build.gradle
@@ -77,13 +77,13 @@ allprojects {
         sign configurations.archives
     }
 
-    version = '2.2.4-SNAPSHOT'
+    version = '2.2.5'
     ext {
         compileSdkVersion = 23
         buildToolsVersion = '23.0.2'
         minSdkVersion = 15
         targetSdkVersion = 23
-        versionCode = 43
+        versionCode = 44
         versionName = version
     }
 }