summaryrefslogtreecommitdiff
path: root/platform/android
diff options
context:
space:
mode:
authorŁukasz Paczos <lukas.paczos@gmail.com>2019-01-28 11:42:18 +0100
committerŁukasz Paczos <lukasz.paczos@mapbox.com>2019-01-29 15:21:01 +0100
commitca8625fba1bc86a42323236f27cb2c7f803a11c5 (patch)
tree48c8be46fa4633994762a83b709ed8715f585f95 /platform/android
parent472e61da39a3e01d8b7a482d8e5c4351c905055b (diff)
downloadqtlocation-mapboxgl-ca8625fba1bc86a42323236f27cb2c7f803a11c5.tar.gz
[android] revert modules vendorization and keep submodules only
Diffstat (limited to 'platform/android')
-rw-r--r--platform/android/LICENSE.md48
-rw-r--r--platform/android/MapboxGLAndroidSDK/build.gradle12
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/build.gradle2
-rw-r--r--platform/android/build.gradle1
-rw-r--r--platform/android/gradle/dependencies.gradle25
-rw-r--r--platform/android/gradle/gradle-publish.gradle46
-rw-r--r--platform/android/gradle/gradle-update-vendor-modules.gradle3
-rw-r--r--platform/android/settings.gradle8
m---------platform/android/vendor/mapbox-events-android0
m---------platform/android/vendor/mapbox-gestures-android0
m---------platform/android/vendor/mapbox-java0
11 files changed, 67 insertions, 78 deletions
diff --git a/platform/android/LICENSE.md b/platform/android/LICENSE.md
index 93c3edfcd9..f69b393541 100644
--- a/platform/android/LICENSE.md
+++ b/platform/android/LICENSE.md
@@ -18,6 +18,18 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
===========================================================================
+Mapbox GL uses portions of the Android Lifecycle Extensions.
+URL: [https://developer.android.com/topic/libraries/architecture/index.html](https://developer.android.com/topic/libraries/architecture/index.html)
+License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+===========================================================================
+
+Mapbox GL uses portions of the Android Lifecycle LiveData.
+URL: [https://developer.android.com/topic/libraries/architecture/index.html](https://developer.android.com/topic/libraries/architecture/index.html)
+License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+===========================================================================
+
Mapbox GL uses portions of the Android Lifecycle LiveData Core.
URL: [https://developer.android.com/topic/libraries/architecture/index.html](https://developer.android.com/topic/libraries/architecture/index.html)
License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -94,6 +106,42 @@ License: [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
===========================================================================
+Mapbox GL uses portions of the Mapbox Android Core Library.
+URL: [https://github.com/mapbox/mapbox-events-android](https://github.com/mapbox/mapbox-events-android)
+License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+===========================================================================
+
+Mapbox GL uses portions of the Mapbox Android Gestures Library.
+URL: [https://github.com/mapbox/mapbox-gestures-android](https://github.com/mapbox/mapbox-gestures-android)
+License: [BSD 2-Clause "Simplified" License](https://raw.githubusercontent.com/mapbox/mapbox-gestures-android/master/LICENSE.md)
+
+===========================================================================
+
+Mapbox GL uses portions of the Mapbox Android Telemetry Library.
+URL: [https://github.com/mapbox/mapbox-events-android](https://github.com/mapbox/mapbox-events-android)
+License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+===========================================================================
+
+Mapbox GL uses portions of the Mapbox Services SDK.
+URL: [https://github.com/mapbox/mapbox-java](https://github.com/mapbox/mapbox-java)
+License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+===========================================================================
+
+Mapbox GL uses portions of the Mapbox Services SDK.
+URL: [https://github.com/mapbox/mapbox-java](https://github.com/mapbox/mapbox-java)
+License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+===========================================================================
+
+Mapbox GL uses portions of the Mapbox Services SDK.
+URL: [https://github.com/mapbox/mapbox-java](https://github.com/mapbox/mapbox-java)
+License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+===========================================================================
+
Mapbox GL uses portions of the OkHttp.
License: [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle
index e6f4cab847..eafb0583c2 100644
--- a/platform/android/MapboxGLAndroidSDK/build.gradle
+++ b/platform/android/MapboxGLAndroidSDK/build.gradle
@@ -4,11 +4,13 @@ apply plugin: 'kotlin-android'
dependencies {
lintChecks project(":MapboxGLAndroidSDKLint")
- api project(":libcore")
- api project(":libtelemetry")
- api project(":MapboxAndroidGestures")
- api project(":services-geojson")
- implementation project(":services-turf")
+ api dependenciesList.mapboxAndroidTelemetry
+ api dependenciesList.mapboxJavaGeoJSON
+ api (dependenciesList.mapboxAndroidGestures) {
+ // workaround until https://github.com/mapbox/mapbox-gestures-android/issues/50 is released
+ exclude group: 'com.jakewharton.timber', module: 'timber'
+ }
+ implementation dependenciesList.mapboxJavaTurf
implementation dependenciesList.supportAppcompatV7
implementation dependenciesList.supportAnnotations
implementation dependenciesList.supportFragmentV4
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
index cc56e002f7..b61397b7c1 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
@@ -57,7 +57,7 @@ dependencies {
implementation dependenciesList.kotlinLib
implementation project(':MapboxGLAndroidSDK')
- implementation project(":services-turf")
+ implementation dependenciesList.mapboxJavaTurf
implementation dependenciesList.supportAppcompatV7
implementation dependenciesList.supportRecyclerView
diff --git a/platform/android/build.gradle b/platform/android/build.gradle
index f1d88e3dc6..e75909c83a 100644
--- a/platform/android/build.gradle
+++ b/platform/android/build.gradle
@@ -1,5 +1,4 @@
buildscript {
- apply from: "${rootDir}/gradle/gradle-update-vendor-modules.gradle"
apply from: "${rootDir}/gradle/dependencies.gradle"
repositories {
diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle
index d6dad86f72..0349738b49 100644
--- a/platform/android/gradle/dependencies.gradle
+++ b/platform/android/gradle/dependencies.gradle
@@ -7,6 +7,9 @@ ext {
]
versions = [
+ mapboxServices : '4.3.0',
+ mapboxTelemetry : '4.2.0',
+ mapboxGestures : '0.3.0',
supportLib : '27.1.1',
constraintLayout: '1.1.2',
espresso : '3.0.2',
@@ -25,23 +28,15 @@ ext {
reLinker : '1.3.1'
]
- vendorArtifacts = [
- mapboxGestures : 'mapbox-android-gestures',
- mapboxJavaCore : 'mapbox-sdk-core',
- mapboxJavaTurf : 'mapbox-sdk-turf',
- mapboxJavaGeojson: 'mapbox-sdk-geojson',
- mapboxTelemetry : 'mapbox-android-telemetry',
- mapboxAndroidCore: 'mapbox-android-core'
- ]
+ 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}",
+ mapboxAndroidGestures : "com.mapbox.mapboxsdk:mapbox-android-gestures:${versions.mapboxGestures}",
- vendorVersions = [
- mapboxGestures : '0.3.0',
- mapboxJava : '4.3.0',
- mapboxTelemetry : '4.2.0',
- mapboxAndroidCore: '1.1.0'
- ]
+ // for testApp
+ mapboxJavaTurf : "com.mapbox.mapboxsdk:mapbox-sdk-turf:${versions.mapboxServices}",
- dependenciesList = [
junit : "junit:junit:${versions.junit}",
mockito : "org.mockito:mockito-core:${versions.mockito}",
mockk : "io.mockk:mockk:${versions.mockk}",
diff --git a/platform/android/gradle/gradle-publish.gradle b/platform/android/gradle/gradle-publish.gradle
index 3f4686444c..a3bf83348f 100644
--- a/platform/android/gradle/gradle-publish.gradle
+++ b/platform/android/gradle/gradle-publish.gradle
@@ -1,6 +1,5 @@
apply plugin: 'maven'
apply plugin: 'signing'
-apply from: "${rootDir}/gradle/dependencies.gradle"
allprojects {
group project.GROUP
@@ -98,21 +97,6 @@ afterEvaluate { project ->
}
}
}
-
- def vendorMap = getVendorMap()
- pom.whenConfigured { pom ->
- println("Current dependencies ${pom.dependencies}")
- pom.dependencies.each { dep ->
- println("Processing vendor ${dep}")
- if (dep.getGroupId() == rootProject.name) {
- Vendor vendor = vendorMap.get(dep.getArtifactId())
- dep.setGroupId(project.GROUP)
- dep.setArtifactId(vendor.artifactName)
- dep.setVersion(vendor.artifactVersion)
- println("Updated vendor ${dep}")
- }
- }
- }
}
}
}
@@ -157,33 +141,3 @@ afterEvaluate { project ->
}
}
}
-
-// this class holds values that will be included in the resulting pom file for vendorized libraries
-class Vendor {
- private final artifactName
- private final artifactVersion
-
- Vendor(artifactName, artifactVersion) {
- this.artifactName = artifactName
- this.artifactVersion = artifactVersion
- }
-
- def getArtifactName() {
- return artifactName
- }
-
- def getArtifactVersion() {
- return artifactVersion
- }
-}
-
-HashMap<String, Vendor> getVendorMap() {
- def map = new HashMap<String, Vendor>()
- map.put("mapbox-android-gestures", new Vendor(vendorArtifacts.mapboxGestures, vendorVersions.mapboxGestures))
- map.put("services-core", new Vendor(vendorArtifacts.mapboxJavaCore, vendorVersions.mapboxJava))
- map.put("services-turf", new Vendor(vendorArtifacts.mapboxJavaTurf, vendorVersions.mapboxJava))
- map.put("services-geojson", new Vendor(vendorArtifacts.mapboxJavaGeojson, vendorVersions.mapboxJava))
- map.put("libcore", new Vendor(vendorArtifacts.mapboxAndroidCore, vendorVersions.mapboxAndroidCore))
- map.put("libtelemetry", new Vendor(vendorArtifacts.mapboxTelemetry, vendorVersions.mapboxTelemetry))
- return map
-} \ No newline at end of file
diff --git a/platform/android/gradle/gradle-update-vendor-modules.gradle b/platform/android/gradle/gradle-update-vendor-modules.gradle
deleted file mode 100644
index 2b8128d211..0000000000
--- a/platform/android/gradle/gradle-update-vendor-modules.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-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 b5fb30106d..c0315fed04 100644
--- a/platform/android/settings.gradle
+++ b/platform/android/settings.gradle
@@ -1,7 +1 @@
-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(':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
+include ':MapboxGLAndroidSDK', ':MapboxGLAndroidSDKTestApp', ':MapboxGLAndroidSDKLint' \ No newline at end of file
diff --git a/platform/android/vendor/mapbox-events-android b/platform/android/vendor/mapbox-events-android
-Subproject 20c31407f259961db0602137a52f33ba5e580dd
+Subproject 1636d1ae9d5b0f0dd2367c8f32f1af958640b14
diff --git a/platform/android/vendor/mapbox-gestures-android b/platform/android/vendor/mapbox-gestures-android
-Subproject 9d105dce2a495d1605fbab75829d33278ae7318
+Subproject 5d2bcdc6d2e30d002d65f38fd2726b094e086c4
diff --git a/platform/android/vendor/mapbox-java b/platform/android/vendor/mapbox-java
-Subproject 22a324ffc37389cebee20aa49e83c08c13221a9
+Subproject f21558ad03967d7600a47ae61bc693898ce5bd6