Make android jar dependency compileOnly

This incorrectly became a dependency of our
published jar. It is only needed during the build
process since the android build process will
substitute the "real" android jars onto the
classpath when the user builds their app.

Author: Tom Blench

CHANGES.md

@@ -1,3 +1,9 @@
+# 2.0.2 (Unreleased)
+- [FIXED] Removed cloudant-sync-datastore-android project's dependency
+  on com.google.android:android. This dependency was inadvertently
+  made a run-time dependency where it should have been a build-time
+  dependency.
+
 # 2.0.1 (2017-04-26)
 - [IMPROVED] Increased the resilience of replication to network failures.
 - [FIXED] NPE when accessing indexes created in earlier versions that were

cloudant-sync-datastore-android/build.gradle

@@ -1,7 +1,7 @@
 dependencies {
     compile project(':cloudant-sync-datastore-core')
 
-    compile group: 'com.google.android', name: 'android', version:'4.0.1.2'
+    compileOnly group: 'com.google.android', name: 'android', version:'4.0.1.2'
 
     // for unit tests
     testCompile 'org.hamcrest:hamcrest-all:1.3'

cloudant-sync-datastore-core/src/test/java/com/cloudant/sync/internal/mazha/ClientTestUtils.java

@@ -26,14 +26,13 @@
 import com.cloudant.sync.internal.common.CouchUtils;
 import com.cloudant.http.Http;
 import com.cloudant.http.HttpConnection;
+import com.cloudant.sync.internal.util.JSONUtils;
 
 import org.apache.commons.io.IOUtils;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.json.JSONTokener;
 import org.junit.Assert;
 
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -225,13 +224,12 @@ public static List<String> getRemoteRevisionIDs(URI uri, CouchConfig config) thr
         connection.responseInterceptors.addAll(config.getResponseInterceptors());
         InputStream in = connection.execute().responseAsInputStream();
 
-        JSONObject jsonObject = new JSONObject(new JSONTokener(IOUtils.toString(in)));
-        JSONArray revsInfo = jsonObject.getJSONArray("_revs_info");
+        Map<String, Object> m = JSONUtils.fromJson(new InputStreamReader(in));
+        List<Object> revsInfo = (List<Object>)m.get("_revs_info");
+        List<String> revisions = new ArrayList<String>(revsInfo.size());
 
-        List<String> revisions = new ArrayList<String>(revsInfo.length());
-
-        for(int i=0; i<revsInfo.length(); i++){
-            revisions.add(revsInfo.getJSONObject(i).getString("rev"));
+        for(Object rev : revsInfo){
+            revisions.add(((Map<String, String>)rev).get("rev"));
         }
 
         return revisions;