summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuha Alanen <juha.alanen@mapbox.com>2020-05-19 10:40:40 +0300
committerThiago Marcos P. Santos <thiago@mapbox.com>2020-05-26 20:37:08 +0300
commitb99121ff0f4309e1e9fe5a38c010419d606e9b9b (patch)
tree9c378f282eb46bf2e2934affa83242307cc31607
parent7726d6ecb89c72cbcf3080545447c303bddce820 (diff)
downloadqtlocation-mapboxgl-b99121ff0f4309e1e9fe5a38c010419d606e9b9b.tar.gz
[test] Update gradle version for Android build
CircleCI updated the environment and build fails with the older version.
-rw-r--r--test/android/build.gradle2
-rw-r--r--test/android/gradle.properties1
-rw-r--r--test/android/gradle/wrapper/gradle-wrapper.properties2
3 files changed, 3 insertions, 2 deletions
diff --git a/test/android/build.gradle b/test/android/build.gradle
index de7242684e..6653bce0af 100644
--- a/test/android/build.gradle
+++ b/test/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.5.3'
+ classpath 'com.android.tools.build:gradle:3.6.3'
}
}
diff --git a/test/android/gradle.properties b/test/android/gradle.properties
index 6ed0f8f960..5e2afb41a4 100644
--- a/test/android/gradle.properties
+++ b/test/android/gradle.properties
@@ -1 +1,2 @@
org.gradle.jvmargs=-Xmx1536m
+android.useAndroidX=true
diff --git a/test/android/gradle/wrapper/gradle-wrapper.properties b/test/android/gradle/wrapper/gradle-wrapper.properties
index 48c45760fb..7ff705ad8b 100644
--- a/test/android/gradle/wrapper/gradle-wrapper.properties
+++ b/test/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip