Release 0.6.0

uphold · Jul 19, 2017 · f3d10b7 · f3d10b7
1 parent 9909ade
commit f3d10b7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.6.0](https://github.com/uphold/uphold-sdk-android/tree/0.6.0) (2017-07-19)
+[Full Changelog](https://github.com/uphold/uphold-sdk-android/compare/0.5.0...0.6.0)
+
+**Merged pull requests:**
+
+- Add `Merchant` model to transaction origin [\#92](https://github.com/uphold/uphold-sdk-android/pull/92) ([d-moreira](https://github.com/d-moreira))
+
 ## [0.5.0](https://github.com/uphold/uphold-sdk-android/tree/0.5.0) (2017-05-23)
 [Full Changelog](https://github.com/uphold/uphold-sdk-android/compare/0.4.0...0.5.0)
 

diff --git a/README.md b/README.md
@@ -22,8 +22,8 @@ repositories {
 }
 
 dependencies {
-	// Add the classifier `sandboxRelease`, i.e. `'com.github.uphold:uphold-sdk-android:0.5.0:sandboxRelease@aar'`, to use the sandbox environment.
-	compile ('com.github.uphold:uphold-sdk-android:0.5.0@aar') {
+	// Add the classifier `sandboxRelease`, i.e. `'com.github.uphold:uphold-sdk-android:0.6.0:sandboxRelease@aar'`, to use the sandbox environment.
+	compile ('com.github.uphold:uphold-sdk-android:0.6.0@aar') {
 	    transitive = true
 	}
 }

diff --git a/src/app/build.gradle b/src/app/build.gradle
@@ -19,8 +19,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 13
-        versionName "0.5.0"
+        versionCode 14
+        versionName "0.6.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 

diff --git a/.../uphold/uphold_android_sdk/test/integration/client/restadapter/UpholdRestAdapterTest.java b/.../uphold/uphold_android_sdk/test/integration/client/restadapter/UpholdRestAdapterTest.java
@@ -62,7 +62,7 @@ public Promise<Card> call(UpholdRestAdapter adapter) {
 
         Assert.assertEquals(request.getHeaders().size(), 2);
         Assert.assertTrue(request.getHeaders().contains(new Header("Authorization", "Bearer fuz")));
-        Assert.assertTrue(request.getHeaders().contains(new Header("User-Agent", "uphold-android-sdk/0.5.0 (https://github.com/uphold/uphold-sdk-android)")));
+        Assert.assertTrue(request.getHeaders().contains(new Header("User-Agent", "uphold-android-sdk/0.6.0 (https://github.com/uphold/uphold-sdk-android)")));
     }
 
     @Test
@@ -83,7 +83,7 @@ public Promise<Card> call(UpholdRestAdapter adapter) {
         Request request = adapter.getRequest();
 
         Assert.assertEquals(request.getHeaders().size(), 1);
-        Assert.assertTrue(request.getHeaders().contains(new Header("User-Agent", "uphold-android-sdk/0.5.0 (https://github.com/uphold/uphold-sdk-android)")));
+        Assert.assertTrue(request.getHeaders().contains(new Header("User-Agent", "uphold-android-sdk/0.6.0 (https://github.com/uphold/uphold-sdk-android)")));
     }
 
     @Test
@@ -104,7 +104,7 @@ public Promise<Card> call(UpholdRestAdapter adapter) {
         Request request = adapter.getRequest();
 
         Assert.assertEquals(request.getHeaders().size(), 1);
-        Assert.assertTrue(request.getHeaders().contains(new Header("User-Agent", "uphold-android-sdk/0.5.0 (https://github.com/uphold/uphold-sdk-android)")));
+        Assert.assertTrue(request.getHeaders().contains(new Header("User-Agent", "uphold-android-sdk/0.6.0 (https://github.com/uphold/uphold-sdk-android)")));
     }
 
 }