diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/build.gradle | 4 | ||||
| -rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/build.gradle | 4 | ||||
| -rw-r--r-- | platform/android/gradle/dependencies.gradle | 6 | ||||
| -rw-r--r-- | platform/android/settings.gradle | 7 | ||||
| m--------- | platform/android/vendor/mapbox-java | 0 |
6 files changed, 12 insertions, 12 deletions
diff --git a/.gitmodules b/.gitmodules index 82094c74f2..ad26551fea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -82,3 +82,6 @@ [submodule "platform/android/vendor/mapbox-gestures-android"] path = platform/android/vendor/mapbox-gestures-android url = https://github.com/mapbox/mapbox-gestures-android.git +[submodule "platform/android/vendor/mapbox-java"] + path = platform/android/vendor/mapbox-java + url = https://github.com/mapbox/mapbox-java.git diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index 8be7e87883..9b0b9bc033 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -5,9 +5,9 @@ apply plugin: 'kotlin-android' dependencies { lintChecks project(":MapboxGLAndroidSDKLint") api dependenciesList.mapboxAndroidTelemetry - api dependenciesList.mapboxJavaGeoJSON api project(":MapboxAndroidGestures") - implementation dependenciesList.mapboxJavaTurf + api project(":services-geojson") + implementation project(":services-turf") implementation dependenciesList.supportAppcompatV7 implementation dependenciesList.supportAnnotations implementation dependenciesList.supportFragmentV4 diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle index 384c49eb7f..a2a8bee22b 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle +++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle @@ -57,8 +57,8 @@ android { dependencies { implementation dependenciesList.kotlinLib - implementation(project(':MapboxGLAndroidSDK')) - implementation(dependenciesList.mapboxJavaTurf) + implementation project(':MapboxGLAndroidSDK') + implementation project(":services-turf") implementation dependenciesList.supportAppcompatV7 implementation dependenciesList.supportRecyclerView diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle index 93174ecd86..3e6f75c612 100644 --- a/platform/android/gradle/dependencies.gradle +++ b/platform/android/gradle/dependencies.gradle @@ -8,7 +8,6 @@ ext { ] versions = [ - mapboxServices : '4.3.0', mapboxTelemetry : '4.1.1', supportLib : '27.1.1', constraintLayout: '1.1.2', @@ -28,13 +27,8 @@ ext { ] dependenciesList = [ - mapboxJavaServices : "com.mapbox.mapboxsdk:mapbox-sdk-services:${versions.mapboxServices}", - mapboxJavaGeoJSON : "com.mapbox.mapboxsdk:mapbox-sdk-geojson:${versions.mapboxServices}", mapboxAndroidTelemetry : "com.mapbox.mapboxsdk:mapbox-android-telemetry:${versions.mapboxTelemetry}", - // for testApp - mapboxJavaTurf : "com.mapbox.mapboxsdk:mapbox-sdk-turf:${versions.mapboxServices}", - junit : "junit:junit:${versions.junit}", mockito : "org.mockito:mockito-core:${versions.mockito}", mockk : "io.mockk:mockk:${versions.mockk}", diff --git a/platform/android/settings.gradle b/platform/android/settings.gradle index c5e007c6ce..4f13c802a8 100644 --- a/platform/android/settings.gradle +++ b/platform/android/settings.gradle @@ -1,2 +1,5 @@ -include ':MapboxGLAndroidSDK', ':MapboxGLAndroidSDKTestApp', ':MapboxGLAndroidSDKLint', ':MapboxAndroidGestures' -project(':MapboxAndroidGestures').projectDir = new File('vendor/mapbox-gestures-android/library')
\ No newline at end of file +include ':MapboxGLAndroidSDK', ':MapboxGLAndroidSDKTestApp', ':MapboxGLAndroidSDKLint', ':MapboxAndroidGestures', ':services-core', ':services-geojson', ':services-turf' +project(':MapboxAndroidGestures').projectDir = new File('vendor/mapbox-gestures-android/library') +project(':services-core').projectDir = new File('vendor/mapbox-java/services-core') +project(':services-geojson').projectDir = new File('vendor/mapbox-java/services-geojson') +project(':services-turf').projectDir = new File('vendor/mapbox-java/services-turf')
\ No newline at end of file diff --git a/platform/android/vendor/mapbox-java b/platform/android/vendor/mapbox-java new file mode 160000 +Subproject 0791fa4f00efac2e3f9f95ed061b248580e9cf3 |