diff options
| author | Juha Alanen <juha.alanen@mapbox.com> | 2020-05-18 15:25:23 +0300 |
|---|---|---|
| committer | Juha Alanen <juha.alanen@mapbox.com> | 2020-05-18 22:49:19 +0300 |
| commit | 2677268640d41419fca4f7dc67481c2f1cd04c53 (patch) | |
| tree | 7a3bdf3ae5a1987316ca26f693fd51d4fc6ee9bc | |
| parent | 2e0bd921fa2fe43eab261563c3153f0d2bef58d6 (diff) | |
| download | qtlocation-mapboxgl-upstream/jmalanen-android-test.tar.gz | |
[test] Update gradle versionupstream/jmalanen-android-test
| -rw-r--r-- | circle.yml | 5 | ||||
| -rw-r--r-- | test/android/build.gradle | 2 | ||||
| -rw-r--r-- | test/android/gradle.properties | 3 | ||||
| -rw-r--r-- | test/android/gradle/wrapper/gradle-wrapper.properties | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/circle.yml b/circle.yml index 5594e73801..2779a210a1 100644 --- a/circle.yml +++ b/circle.yml @@ -65,7 +65,6 @@ executors: QT_INSTALL_DOCS: /usr/share/qt5/doc QT_VERSION: 5 TSAN_OPTIONS: suppressions=/src/platform/linux/tsan_suppress.txt - GRADLE_OPTS: "-Dorg.gradle.jvmargs='-Xmx14000m'" macos-11_1_0: macos: xcode: '11.1.0' @@ -439,6 +438,10 @@ jobs: - checkout - prepare - run: + name: Install NDK + command: | + /opt/android/tools/bin/sdkmanager --install "ndk;20.0.5594570" + - run: name: Build UnitTestRunner APK command: | cd test/android 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 83829bbe8f..4fc032a48a 100644 --- a/test/android/gradle.properties +++ b/test/android/gradle.properties @@ -1 +1,2 @@ -org.gradle.jvmargs=-Xmx14000m +org.gradle.jvmargs=-Xmx1536m +android.useAndroidX=true
\ No newline at end of file diff --git a/test/android/gradle/wrapper/gradle-wrapper.properties b/test/android/gradle/wrapper/gradle-wrapper.properties index 48c45760fb..1c4b263b01 100644 --- a/test/android/gradle/wrapper/gradle-wrapper.properties +++ b/test/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Feb 05 19:39:12 IST 2017 +#Mon May 18 14:56:48 EEST 2020 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 |