From b803576542a636b0412b214f74cfdaa94be465cc Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Mon, 28 Mar 2022 19:13:20 +0200 Subject: [PATCH] android,Dockerfile: bump NDK, Gradle Nix support is easier to do with recent NDK and Gradle dependencies. Bump them here, and add Nix support in a follow-up. Signed-off-by: Elias Naur --- Dockerfile | 2 +- android/build.gradle | 3 ++- android/gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1d152fc..25b2255 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN unzip sdk-tools-linux-3859397.zip RUN echo y | $ANDROID_HOME/tools/bin/sdkmanager --update RUN echo y | $ANDROID_HOME/tools/bin/sdkmanager 'platforms;android-31' RUN echo y | $ANDROID_HOME/tools/bin/sdkmanager 'extras;android;m2repository' -RUN echo y | $ANDROID_HOME/tools/bin/sdkmanager 'ndk;20.0.5594570' +RUN echo y | $ANDROID_HOME/tools/bin/sdkmanager 'ndk;23.1.7779620' RUN echo y | $ANDROID_HOME/tools/bin/sdkmanager 'platform-tools' RUN echo y | $ANDROID_HOME/tools/bin/sdkmanager 'build-tools;28.0.3' diff --git a/android/build.gradle b/android/build.gradle index c9668f9..9e38d5c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } @@ -21,6 +21,7 @@ allprojects { apply plugin: 'com.android.application' android { + ndkVersion "23.1.7779620" compileSdkVersion 30 defaultConfig { minSdkVersion 22 diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 5b3f9ca..8174453 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=038794feef1f4745c6347107b6726279d1c824f3fc634b60f86ace1e9fbd1768 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +distributionSha256Sum=3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists