Re-arrange build.gradle, add javarosa support from gradle (getodk#767)

build.gradle

@@ -12,6 +12,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven { url = 'https://oss.sonatype.org/content/groups/public' }
     }
 }
 

collect_app/build.gradle

@@ -1,13 +1,7 @@
 apply plugin: 'com.android.application'
-
-import com.android.ddmlib.DdmPreferences
-
-/**************************************************************************************************
- GRADLE CONFIG
- *************************************************************************************************/
-
 apply plugin: 'checkstyle'
 
+import com.android.ddmlib.DdmPreferences
 DdmPreferences.setTimeOut(60000)
 
 ant.condition(property: "os", value: "windows") { os(family: "windows") }
@@ -140,32 +134,27 @@ allprojects {
 
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
+    compile group: 'com.android.support', name: 'appcompat-v7', version: '25.1.0'
+    compile group: 'com.android.support', name: 'multidex', version: '1.0.1'
     compile group: 'com.google.android.gms', name: 'play-services-analytics', version: '10.0.1'
-    compile group: 'com.google.android.gms', name: 'play-services-maps', version: '10.0.1'
     compile group: 'com.google.android.gms', name: 'play-services-auth', version: '10.0.1'
-    compile group: 'com.android.support', name: 'multidex', version: '1.0.1'
-    compile group: 'commons-io', name: 'commons-io', version: '2.4'
-    compile group: 'net.sf.kxml', name: 'kxml2', version: '2.3.0'
-    compile group: 'net.sf.opencsv', name: 'opencsv', version: '2.3'
-    compile group: 'org.slf4j', name: 'slf4j-android', version: '1.6.1-RC1'
+    compile group: 'com.google.android.gms', name: 'play-services-maps', version: '10.0.1'
     compile group: 'com.google.code.gson', name: 'gson', version: '2.6.2'
-    compile group: 'org.osmdroid', name: 'osmdroid-android', version: '4.2'
-    compile group: 'joda-time', name: 'joda-time', version: '2.9.7'
-    compile group: 'com.android.support', name: 'appcompat-v7', version: '25.1.0'
     compile group: 'com.google.firebase', name: 'firebase-core', version: '9.2.0'
     compile group: 'com.google.firebase', name: 'firebase-crash', version: '9.2.0'
-    compile group: 'pub.devrel', name: 'easypermissions', version: '0.2.1'
-    compile(group: 'com.google.apis', name: 'google-api-services-sheets', version: 'v4-rev463-1.22.0') {
-        exclude group: 'org.apache.httpcomponents'
-    }
-    compile(group: 'com.google.api-client', name: 'google-api-client-android', version: '1.22.0') {
-        exclude group: 'org.apache.httpcomponents'
-    }
-    compile(group: 'com.google.apis', name: 'google-api-services-drive', version: 'v3-rev64-1.22.0') {
-        exclude group: 'org.apache.httpcomponents'
-    }
     compile group: 'com.google.http-client', name: 'google-http-client', version: '1.22.0'
     compile group: 'com.google.oauth-client', name: 'google-oauth-client', version: '1.22.0'
+    compile group: 'commons-io', name: 'commons-io', version: '2.4'
+    compile group: 'joda-time', name: 'joda-time', version: '2.9.7'
+    compile group: 'net.sf.kxml', name: 'kxml2', version: '2.3.0'
+    compile group: 'net.sf.opencsv', name: 'opencsv', version: '2.3'
+    compile group: 'org.opendatakit', name: 'opendatakit-javarosa', version: '2.1.0-SNAPSHOT'
+    compile group: 'org.osmdroid', name: 'osmdroid-android', version: '4.2'
+    compile group: 'org.slf4j', name: 'slf4j-android', version: '1.6.1-RC1'
+    compile group: 'pub.devrel', name: 'easypermissions', version: '0.2.1'
+    compile(group: 'com.google.api-client', name: 'google-api-client-android', version: '1.22.0') { exclude group: 'org.apache.httpcomponents' }
+    compile(group: 'com.google.apis', name: 'google-api-services-drive', version: 'v3-rev64-1.22.0') { exclude group: 'org.apache.httpcomponents' }
+    compile(group: 'com.google.apis', name: 'google-api-services-sheets', version: 'v4-rev463-1.22.0') { exclude group: 'org.apache.httpcomponents' }
 
     // Testing-only dependencies
     testCompile group: 'junit', name: 'junit', version: '4.12'
@@ -177,4 +166,6 @@ dependencies {
     androidTestCompile group: 'com.android.support.test', name: 'rules', version: '0.5'
 }
 
-apply plugin: 'com.google.gms.google-services'
+// Must be at bottom to prevent dependency collisions
+// https://developers.google.com/android/guides/google-services-plugin
+apply plugin: 'com.google.gms.google-services'