[android] mapbox-events-android vendor

mapbox · Jan 11, 2019 · ac26f62 · ac26f62
1 parent f1ddf65
commit ac26f62
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -85,3 +85,6 @@
 [submodule "platform/android/vendor/mapbox-java"]
 	path = platform/android/vendor/mapbox-java
 	url = https://github.com/mapbox/mapbox-java.git
+[submodule "platform/android/vendor/mapbox-events-android"]
+	path = platform/android/vendor/mapbox-events-android
+	url = https://github.com/mapbox/mapbox-events-android.git
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle
@@ -4,7 +4,8 @@ apply plugin: 'kotlin-android'
 
 dependencies {
     lintChecks project(":MapboxGLAndroidSDKLint")
-    api dependenciesList.mapboxAndroidTelemetry
+    api project(":libcore")
+    api project(":libtelemetry")
     api project(":MapboxAndroidGestures")
     api project(":services-geojson")
     implementation project(":services-turf")

diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle
@@ -8,7 +8,6 @@ ext {
     ]
 
     versions = [
-            mapboxTelemetry : '4.1.1',
             supportLib      : '27.1.1',
             constraintLayout: '1.1.2',
             espresso        : '3.0.2',
@@ -27,8 +26,6 @@ ext {
     ]
 
     dependenciesList = [
-            mapboxAndroidTelemetry : "com.mapbox.mapboxsdk:mapbox-android-telemetry:${versions.mapboxTelemetry}",
-
             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
@@ -1,5 +1,7 @@
-include ':MapboxGLAndroidSDK', ':MapboxGLAndroidSDKTestApp', ':MapboxGLAndroidSDKLint', ':MapboxAndroidGestures', ':services-core', ':services-geojson', ':services-turf'
+include ':MapboxGLAndroidSDK', ':MapboxGLAndroidSDKTestApp', ':MapboxGLAndroidSDKLint', ':MapboxAndroidGestures', ':services-core', ':services-geojson', ':services-turf', ':libtelemetry', ':libcore'
 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')
+project(':services-turf').projectDir = new File('vendor/mapbox-java/services-turf')
+project(':libtelemetry').projectDir = new File('vendor/mapbox-events-android/libtelemetry')
+project(':libcore').projectDir = new File('vendor/mapbox-events-android/libcore')
diff --git a/platform/android/vendor/mapbox-events-android b/platform/android/vendor/mapbox-events-android