diff options
| author | Guardiola31337 <pablo.guardiola@mapbox.com> | 2018-02-09 13:37:24 +0100 |
|---|---|---|
| committer | Guardiola31337 <pablo.guardiola@mapbox.com> | 2018-02-09 13:37:24 +0100 |
| commit | 8179f0a714e3c3cbd0757bcb9f5a9b0cf39d6eb3 (patch) | |
| tree | 14339bfb4b2afd9fe573a070168a6541ed3838f0 | |
| parent | 7a0a4c44f469e180606afa250a47414441e8e675 (diff) | |
| download | qtlocation-mapboxgl-upstream/pg-11125-transitive-deps-mas.tar.gz | |
[android] remove unnecessary @jar and @aar dependencies suffixesupstream/pg-11125-transitive-deps-mas
| -rw-r--r-- | circle.yml | 2 | ||||
| -rw-r--r-- | platform/android/gradle/dependencies.gradle | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/circle.yml b/circle.yml index c40b6c9c11..3650defad8 100644 --- a/circle.yml +++ b/circle.yml @@ -403,7 +403,7 @@ jobs: - deploy: name: Publish to Maven command: | - if [ "${CIRCLE_BRANCH}" == "release-boba" ]; then make run-android-upload-archives ; fi + if [ "${CIRCLE_BRANCH}" == "pg-11125-transitive-deps-mas" ]; then make run-android-upload-archives ; fi # ------------------------------------------------------------------------------ diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle index 7ce0cd6196..99fa3f3508 100644 --- a/platform/android/gradle/dependencies.gradle +++ b/platform/android/gradle/dependencies.gradle @@ -23,12 +23,12 @@ ext { ] dependenciesList = [ - mapboxJavaServices : "com.mapbox.mapboxsdk:mapbox-sdk-services:${versions.mapboxServices}@jar", - mapboxJavaGeoJSON : "com.mapbox.mapboxsdk:mapbox-sdk-geojson:${versions.mapboxServices}@jar", - mapboxAndroidTelemetry: "com.mapbox.mapboxsdk:mapbox-android-telemetry:${versions.mapboxTelemetry}@aar", + 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}@jar", + mapboxJavaTurf : "com.mapbox.mapboxsdk:mapbox-sdk-turf:${versions.mapboxServices}", junit : "junit:junit:${versions.junit}", mockito : "org.mockito:mockito-core:${versions.mockito}", |