diff options
| author | tobrun <tobrun.van.nuland@gmail.com> | 2018-02-06 22:48:49 +0100 |
|---|---|---|
| committer | tobrun <tobrun.van.nuland@gmail.com> | 2018-02-06 22:48:49 +0100 |
| commit | edc6e38d703a2bb1fdd14d6dd89e8c93bfdfbd5c (patch) | |
| tree | 29917528c24695cad5c4d8a0a2eaa3c0e330bda0 | |
| parent | afdb2916537f648f17122fa2c96f8b88759d28cc (diff) | |
| download | qtlocation-mapboxgl-upstream/tvn-api-gradle.tar.gz | |
[android] - replace compile with apiupstream/tvn-api-gradle
| -rw-r--r-- | circle.yml | 4 | ||||
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/build.gradle | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/circle.yml b/circle.yml index c40b6c9c11..44dbb246a5 100644 --- a/circle.yml +++ b/circle.yml @@ -342,7 +342,7 @@ jobs: gcloud firebase test android run --type instrumentation \ --app platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/debug/MapboxGLAndroidSDKTestApp-debug.apk \ --test platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/androidTest/debug/MapboxGLAndroidSDKTestApp-debug-androidTest.apk \ - --device-ids sailfish --os-version-ids 26 --locales en --orientations portrait --timeout 20m + --device-ids sailfish --os-version-ids 26 --locales en --orientations portrait --timeout 20m - store_artifacts: path: platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/debug destination: . @@ -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}" == "tvn-api-gradle" ]; then make run-android-upload-archives ; fi # ------------------------------------------------------------------------------ diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index 0900f700c8..0122280b76 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -3,10 +3,10 @@ apply plugin: 'com.android.library' dependencies { api dependenciesList.mapboxAndroidTelemetry api dependenciesList.mapboxJavaGeoJSON - implementation dependenciesList.supportAnnotations - implementation dependenciesList.supportFragmentV4 - implementation dependenciesList.timber - implementation dependenciesList.okhttp3 + api dependenciesList.supportAnnotations + api dependenciesList.supportFragmentV4 + api dependenciesList.timber + api dependenciesList.okhttp3 compileOnly(dependenciesList.lost) { exclude group: 'com.google.guava' exclude group: 'com.android.support' |