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/MapboxGLAndroidSDK/build.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/MapboxGLAndroidSDK/build.gradle')
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/build.gradle | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index c43bc9112b..21ed25e2c2 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -1,9 +1,13 @@ apply plugin: 'com.android.library' dependencies { - api dependenciesList.mapboxAndroidTelemetry + api (dependenciesList.mapboxAndroidTelemetry) { + exclude group: 'com.android.support', module: 'appcompat-v7' + } api dependenciesList.mapboxJavaGeoJSON - api dependenciesList.mapboxAndroidGestures + api (dependenciesList.mapboxAndroidGestures) { + exclude group: 'com.android.support', module: 'appcompat-v7' + } implementation dependenciesList.supportAnnotations implementation dependenciesList.supportFragmentV4 implementation dependenciesList.timber @@ -87,7 +91,7 @@ android { if (abi != 'all') { abiFilters abi.split(' ') } else { - abiFilters "armeabi", "armeabi-v7a", "mips", "x86", "arm64-v8a", "x86_64" + abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64" } } } @@ -111,7 +115,7 @@ android { } lintOptions { - disable 'MissingTranslation', 'TypographyQuotes', 'ObsoleteLintCustomCheck', 'MissingPermission' + disable 'MissingTranslation', 'TypographyQuotes', 'ObsoleteLintCustomCheck', 'MissingPermission', 'WrongThreadInterprocedural' checkAllWarnings true warningsAsErrors false } |