diff options
| author | Tobrun <tobrun@mapbox.com> | 2017-03-03 17:36:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-03 17:36:40 -0500 |
| commit | a5f6ee696367e3311334faa03fb55e215174997f (patch) | |
| tree | db6d2c952d9ab25703da9b2f1d0ca077aeef9ab8 /platform | |
| parent | 8742dc852c82ef40003a22a8e0a764616d8beed1 (diff) | |
| download | qtlocation-mapboxgl-a5f6ee696367e3311334faa03fb55e215174997f.tar.gz | |
[android] - update gradle and plugin for Android Studio 2.3 stable, update support library to latest version, add dexOptions to increase build times. (#8271)
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/build.gradle | 6 | ||||
| -rw-r--r-- | platform/android/build.gradle | 2 | ||||
| -rw-r--r-- | platform/android/dependencies.gradle | 2 | ||||
| -rw-r--r-- | platform/android/gradle/wrapper/gradle-wrapper.properties | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle index 1b4d54106d..10baf2e108 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle +++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle @@ -46,6 +46,12 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + dexOptions { + maxProcessCount 8 + javaMaxHeapSize "2g" + preDexLibraries true + } } dependencies { diff --git a/platform/android/build.gradle b/platform/android/build.gradle index 69eb6616d1..4219f2bdee 100644 --- a/platform/android/build.gradle +++ b/platform/android/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.0' classpath 'com.amazonaws:aws-devicefarm-gradle-plugin:1.2' classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.1' } diff --git a/platform/android/dependencies.gradle b/platform/android/dependencies.gradle index 2cdb455190..3eb28452c6 100644 --- a/platform/android/dependencies.gradle +++ b/platform/android/dependencies.gradle @@ -7,7 +7,7 @@ ext { versionCode = 11 versionName = "5.0.0" - supportLibVersion = "25.1.1" + supportLibVersion = "25.2.0" leakCanaryVersion = '1.5' wearableVersion = '2.0.0' diff --git a/platform/android/gradle/wrapper/gradle-wrapper.properties b/platform/android/gradle/wrapper/gradle-wrapper.properties index 20b2b0894c..c7ad166b13 100644 --- a/platform/android/gradle/wrapper/gradle-wrapper.properties +++ b/platform/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 12 10:58:15 CET 2016 +#Fri Mar 03 10:22:19 EST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip |