Merge pull request #113 from mapbox/95-libjava-build

Use master branch from libjava during dev

Author: Cameron Mace

libandroid/lib/build.gradle

@@ -32,10 +32,13 @@ dependencies {
     compile 'com.android.support:appcompat-v7:23.3.0'
     compile 'com.android.support:design:23.3.0'
 
-    // Mapbox Java Services
-    compile ('com.mapbox.mapboxsdk:mapbox-java-services:1.2.0@jar') {
-        transitive=true
-    }
+    // Mapbox Java Services (development)
+    compile project(':libjava')
+
+    // Mapbox Java Services (release)
+//    compile ('com.mapbox.mapboxsdk:mapbox-java-services:1.2.0@jar') {
+//        transitive=true
+//    }
 
     // Testing
     testCompile 'junit:junit:4.12'

libandroid/settings.gradle

@@ -1 +1,5 @@
 include ':app', ':lib'
+
+// Only used during development
+include ':libjava'
+project(':libjava').projectDir = new File(settingsDir, '../libjava/lib')