diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2018-03-15 13:07:46 +0100 |
|---|---|---|
| committer | Tobrun <tobrun@mapbox.com> | 2018-05-22 17:53:34 +0200 |
| commit | 60505b03174b5ec02ae723beafa7683f6ed54a62 (patch) | |
| tree | f54cac803f072f534ca46c3f21eb9971a1591f19 /platform/android/gradle | |
| parent | cce72e2d36c5efe53bb026a0d98f835d16440ffa (diff) | |
| download | qtlocation-mapboxgl-60505b03174b5ec02ae723beafa7683f6ed54a62.tar.gz | |
[android] - remove mips and armeabi as supported ABIs
[android] - bump CI image to NDK 17 compatible
[core] - remove setting edgeDistance to 0, comparison 'const short' > 32767 is always false
[android] - remove throwing in desructor, undefined behaviour
[android] - bump dependency versions of project
Diffstat (limited to 'platform/android/gradle')
| -rw-r--r-- | platform/android/gradle/dependencies.gradle | 22 | ||||
| -rw-r--r-- | platform/android/gradle/wrapper/gradle-wrapper.properties | 3 |
2 files changed, 12 insertions, 13 deletions
diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle index b9744a61ef..ff61b1d074 100644 --- a/platform/android/gradle/dependencies.gradle +++ b/platform/android/gradle/dependencies.gradle @@ -2,24 +2,23 @@ ext { androidVersions = [ minSdkVersion : 14, - targetSdkVersion : 25, - compileSdkVersion: 25, - buildToolsVersion: '26.0.3' + targetSdkVersion : 27, + compileSdkVersion: 27, + buildToolsVersion: '27.0.3' ] versions = [ mapboxServices : '3.1.0', mapboxTelemetry: '3.1.1', mapboxGestures : '0.2.0', - supportLib : '25.4.0', - espresso : '3.0.1', - testRunner : '1.0.1', - leakCanary : '1.5.1', - lost : '3.0.4', + supportLib : '27.1.1', + espresso : '3.0.2', + testRunner : '1.0.2', + leakCanary : '1.5.4', junit : '4.12', - mockito : '2.10.0', - robolectric : '3.5.1', - timber : '4.5.1', + mockito : '2.18.3', + robolectric : '3.8', + timber : '4.7.0', okhttp : '3.10.0' ] @@ -48,7 +47,6 @@ ext { supportDesign : "com.android.support:design:${versions.supportLib}", supportRecyclerView : "com.android.support:recyclerview-v7:${versions.supportLib}", - lost : "com.mapzen.android:lost:${versions.lost}", gmsLocation : 'com.google.android.gms:play-services-location:11.0.4', timber : "com.jakewharton.timber:timber:${versions.timber}", okhttp3 : "com.squareup.okhttp3:okhttp:${versions.okhttp}", diff --git a/platform/android/gradle/wrapper/gradle-wrapper.properties b/platform/android/gradle/wrapper/gradle-wrapper.properties index bf1b63c346..84af82d181 100644 --- a/platform/android/gradle/wrapper/gradle-wrapper.properties +++ b/platform/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Mon May 14 12:12:39 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip |