diff options
| author | Łukasz Paczos <lukasz.paczos@mapbox.com> | 2018-12-18 12:46:20 +0100 |
|---|---|---|
| committer | Łukasz Paczos <lukasz.paczos@mapbox.com> | 2019-01-15 14:21:26 +0100 |
| commit | d617b87b4de99b2dc31102032d29a6cabd2fe7eb (patch) | |
| tree | 8995e5665d549fc2c76e1752758b0469c1968c16 /platform | |
| parent | e6e07a68094bb753da3714fdeb22d84760193d33 (diff) | |
| download | qtlocation-mapboxgl-d617b87b4de99b2dc31102032d29a6cabd2fe7eb.tar.gz | |
[android] mapbox-gestures-android vendor
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/build.gradle | 2 | ||||
| -rw-r--r-- | platform/android/build.gradle | 1 | ||||
| -rw-r--r-- | platform/android/gradle/dependencies.gradle | 2 | ||||
| -rw-r--r-- | platform/android/gradle/gradle-update-vendor-modules.gradle | 3 | ||||
| -rw-r--r-- | platform/android/settings.gradle | 3 | ||||
| m--------- | platform/android/vendor/mapbox-gestures-android | 0 |
6 files changed, 7 insertions, 4 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index 5e7347e3f2..8be7e87883 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -6,7 +6,7 @@ dependencies { lintChecks project(":MapboxGLAndroidSDKLint") api dependenciesList.mapboxAndroidTelemetry api dependenciesList.mapboxJavaGeoJSON - api dependenciesList.mapboxAndroidGestures + api project(":MapboxAndroidGestures") implementation dependenciesList.mapboxJavaTurf implementation dependenciesList.supportAppcompatV7 implementation dependenciesList.supportAnnotations diff --git a/platform/android/build.gradle b/platform/android/build.gradle index 86e4f4f5f8..9047bb5d96 100644 --- a/platform/android/build.gradle +++ b/platform/android/build.gradle @@ -29,3 +29,4 @@ subprojects { // Load build system information. If this file does not exist, run // `make platform/android/gradle/configuration.gradle` apply from: "${rootDir}/gradle/configuration.gradle" +apply from: "${rootDir}/gradle/gradle-update-vendor-modules.gradle" diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle index be6c781442..93174ecd86 100644 --- a/platform/android/gradle/dependencies.gradle +++ b/platform/android/gradle/dependencies.gradle @@ -10,7 +10,6 @@ ext { versions = [ mapboxServices : '4.3.0', mapboxTelemetry : '4.1.1', - mapboxGestures : '0.3.0', supportLib : '27.1.1', constraintLayout: '1.1.2', espresso : '3.0.2', @@ -32,7 +31,6 @@ ext { 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}", - mapboxAndroidGestures : "com.mapbox.mapboxsdk:mapbox-android-gestures:${versions.mapboxGestures}", // for testApp mapboxJavaTurf : "com.mapbox.mapboxsdk:mapbox-sdk-turf:${versions.mapboxServices}", diff --git a/platform/android/gradle/gradle-update-vendor-modules.gradle b/platform/android/gradle/gradle-update-vendor-modules.gradle new file mode 100644 index 0000000000..2b8128d211 --- /dev/null +++ b/platform/android/gradle/gradle-update-vendor-modules.gradle @@ -0,0 +1,3 @@ +task updateVendorSubmodules { + "git submodule update --init --recursive vendor".execute() +}
\ No newline at end of file diff --git a/platform/android/settings.gradle b/platform/android/settings.gradle index c0315fed04..c5e007c6ce 100644 --- a/platform/android/settings.gradle +++ b/platform/android/settings.gradle @@ -1 +1,2 @@ -include ':MapboxGLAndroidSDK', ':MapboxGLAndroidSDKTestApp', ':MapboxGLAndroidSDKLint'
\ No newline at end of file +include ':MapboxGLAndroidSDK', ':MapboxGLAndroidSDKTestApp', ':MapboxGLAndroidSDKLint', ':MapboxAndroidGestures' +project(':MapboxAndroidGestures').projectDir = new File('vendor/mapbox-gestures-android/library')
\ No newline at end of file diff --git a/platform/android/vendor/mapbox-gestures-android b/platform/android/vendor/mapbox-gestures-android new file mode 160000 +Subproject 796b778043d026eada8f6f02ba393db2d3b0027 |