Raise jdk 17->21, update to latest gradle wrapper

android/.gradle/gradle.properties

@@ -1,3 +1,12 @@
-org.gradle.jvmargs=-Xmx4608M
-android.useAndroidX = true
+# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
+org.gradle.jvmargs=-Xmx4608M -Dfile.encoding=UTF-8
+org.gradle.dependency.verification.console=verbose
+android.useAndroidX=true
 android.enableJetifier = true
+kotlin.code.style=official
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true
+android.nonFinalResIds=false

android/Dockerfile

@@ -1,10 +1,13 @@
-FROM debian:bullseye
+FROM debian:bookworm
 
 RUN apt-get update && apt-get install -y apt-utils software-properties-common
-RUN apt-get install -y ruby wget libxdamage1 libgl1-mesa-glx libpulse0 locales unzip openjdk-17-jdk curl qrencode git && \
+RUN apt-get install -y ruby wget libxdamage1 libgl1-mesa-glx libpulse0 locales unzip curl qrencode git && \
     apt-get autoremove -y && apt-get autoclean && apt-get clean && \
     rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/*
 
+RUN cd /tmp/ && wget https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-x64_bin.tar.gz && \
+	tar xf openjdk-21.0.2_linux-x64_bin.tar.gz && mv jdk-21.0.2 /usr/local/jdk-21 && rm openjdk-21.0.2_linux-x64_bin.tar.gz
+
 RUN mkdir /opt/android-sdk-linux && \
     cd /opt/android-sdk-linux && \
     wget --output-document=android-sdk.zip https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip && \
@@ -17,7 +20,8 @@ RUN mkdir /opt/android-sdk-linux && \
 ENV SHELL /bin/bash
 ENV ANDROID_HOME=/opt/android-sdk-linux/
 ENV ANDROID_SDK_ROOT=/opt/android-sdk-linux/
-ENV PATH=$PATH:/opt/android-sdk-linux/cmdline-tools/latest/bin/:/opt/android-sdk-linux/emulator/:/opt/android-sdk-linux/platform-tools/
+ENV PATH=$PATH:/opt/android-sdk-linux/cmdline-tools/latest/bin/:/opt/android-sdk-linux/emulator/:/opt/android-sdk-linux/platform-tools/:/usr/local/jdk-21/bin
+ENV JAVA_HOME=/usr/local/jdk-21
 
 RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen
 RUN locale-gen && update-locale LANG=en_US.UTF-8

android/gradle/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip