Skip to content

Commit d47c7f4

Browse files
committed
let use libjava master branch during dev
1 parent 96829cd commit d47c7f4

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

libandroid/lib/build.gradle

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,13 @@ dependencies {
3232
compile 'com.android.support:appcompat-v7:23.3.0'
3333
compile 'com.android.support:design:23.3.0'
3434

35-
// Mapbox Java Services
36-
compile ('com.mapbox.mapboxsdk:mapbox-java-services:1.2.0@jar') {
37-
transitive=true
38-
}
35+
// Mapbox Java Services (development)
36+
compile project(':libjava')
37+
38+
// Mapbox Java Services (release)
39+
// compile ('com.mapbox.mapboxsdk:mapbox-java-services:1.2.0@jar') {
40+
// transitive=true
41+
// }
3942

4043
// Testing
4144
testCompile 'junit:junit:4.12'

libandroid/settings.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
include ':app', ':lib'
2+
3+
// Only used during development
4+
include ':libjava'
5+
project(':libjava').projectDir = new File(settingsDir, '../libjava/lib')

0 commit comments

Comments
 (0)