Fixed gradle test updated to 1.0.21

Layoric · Layoric · commit b28c33cbc808 · 2015-12-11T20:11:05.000+11:00
diff --git a/src/AndroidClient/android/build.gradle b/src/AndroidClient/android/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = "1.0.20"
+version = "1.0.21"
 
 android {
     compileSdkVersion 23
diff --git a/src/AndroidClient/client/build.gradle b/src/AndroidClient/client/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testCompile 'org.mockito:mockito-core:1.9.5'
 }
 
-version = "1.0.20"
+version = "1.0.21"
 group = "net.servicestack"                                        // Maven Group ID for the artifact
 String packageId = "client"
 String groupID = group
diff --git a/src/AndroidClient/client/pom.xml b/src/AndroidClient/client/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>net.servicestack</groupId>
   <artifactId>client</artifactId>
-  <version>1.0.20</version>
+  <version>1.0.21</version>
   <name>ServiceStack.Client</name>
   <description>A client library to call your ServiceStack webservices.</description>
   <url>https://github.com/ServiceStack/ServiceStack.Java</url>
diff --git a/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TechStacksServiceTests.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TechStacksServiceTests.java
@@ -118,8 +118,8 @@ public void test_Can_deserialize_Overview() throws IOException {
 //Latest Android Update broke test resources
 //        InputStream stream = this.getClass().getClassLoader().getResourceAsStream("overview.json");
 //        String json = Utils.readToEnd(stream, "UTF-8");
-
-        String json =  Utils.readToEnd(new FileInputStream("src\\test\\res\\overview.json"), "UTF-8");
+        // Works from gradle -> test or check as they run 'processTestResources' that copy resources into build directory
+        String json =  Utils.readToEnd(getClass().getResourceAsStream("/overview.json"), "UTF-8");
 
         OverviewResponse dto = (OverviewResponse)client.fromJson(json, OverviewResponse.class);
 
diff --git a/src/AndroidClient/client/src/test/resources/overview.json b/src/AndroidClient/client/src/test/resources/overview.json

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ dependencies {`
`11`	`11`	`testCompile 'org.mockito:mockito-core:1.9.5'`
`12`	`12`	`}`
`13`	`13`
`14`		`-version = "1.0.20"`
	`14`	`+version = "1.0.21"`
`15`	`15`	`group = "net.servicestack" // Maven Group ID for the artifact`
`16`	`16`	`String packageId = "client"`
`17`	`17`	`String groupID = group`