diff options
| author | Łukasz Paczos <lukas.paczos@gmail.com> | 2019-01-11 18:39:12 +0100 |
|---|---|---|
| committer | Łukasz Paczos <lukasz.paczos@mapbox.com> | 2019-01-15 14:21:26 +0100 |
| commit | 405aef0b47a805bad21ba96dd2419426cdc6bf25 (patch) | |
| tree | 1c524945bb734d3986a31c17db7e9c56567013fa | |
| parent | 0cc928861a3335c0e74b695442446c13989ae6dc (diff) | |
| download | qtlocation-mapboxgl-405aef0b47a805bad21ba96dd2419426cdc6bf25.tar.gz | |
[android] mapbox-events-android vendor
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/build.gradle | 3 | ||||
| -rw-r--r-- | platform/android/gradle/dependencies.gradle | 3 | ||||
| -rw-r--r-- | platform/android/settings.gradle | 6 | ||||
| m--------- | platform/android/vendor/mapbox-events-android | 0 |
5 files changed, 9 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules index ad26551fea..9031496728 100644 --- 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 index 9b0b9bc033..25008de919 100644 --- 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 index 3e6f75c612..c044f4172b 100644 --- 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 index 4f13c802a8..b5fb30106d 100644 --- 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')
\ No newline at end of file +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')
\ No newline at end of file diff --git a/platform/android/vendor/mapbox-events-android b/platform/android/vendor/mapbox-events-android new file mode 160000 +Subproject 1e733ba20b9f0e5c2ec4ab624b84f87eaa5b9a8 |