Update dependencies and migrate to Jetpack view binding

Kotlin upgrade was required due to some dependencies that uses OkHttp. This Kotlin upgrade required Gradle upgrade which required migration to Jetpack view binding.
As we touched a lot of the UI code due to the migration, we now use as ID always snake case and not camel case and snake case mixed.

Author: SailReal

build.gradle

@@ -1,16 +1,14 @@
 apply from: 'buildsystem/dependencies.gradle'
-apply plugin: "com.vanniktech.android.junit.jacoco"
 
 buildscript {
-	ext.kotlin_version = '1.7.20'
+	ext.kotlin_version = '1.9.24'
 	repositories {
 		mavenCentral()
 		google()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:7.4.2'
-		classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0'
-		classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.16.0'
+		classpath 'com.android.tools.build:gradle:8.4.1'
+		classpath 'org.greenrobot:greendao-gradle-plugin:3.3.1'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 		classpath "de.mannodermaus.gradle.plugins:android-junit5:1.7.1.1"
 	}

buildsystem/Dockerfile

@@ -19,9 +19,9 @@ RUN apt-get update -y && apt-get install -y apt-utils wget git unzip
 RUN apt-get update -y && apt-get install -y $(cat docker/dependencies.txt)
 RUN docker/print-versions.sh docker/dependencies.txt
 
-ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME commandlinetools-linux-9477386_latest.zip
-ENV ANDROID_API_LEVELS                  android-33
-ENV ANDROID_BUILD_TOOLS_VERSION         33.0.2
+ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME commandlinetools-linux-10406996_latest.zip
+ENV ANDROID_API_LEVELS                  android-34
+ENV ANDROID_BUILD_TOOLS_VERSION         34.0.0
 
 ENV ANDROID_HOME /usr/local/android-sdk-linux
 ENV PATH         ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/bin
@@ -35,6 +35,6 @@ RUN yes | sdkmanager --update --sdk_root="${ANDROID_HOME}"
 RUN yes | sdkmanager --sdk_root="${ANDROID_HOME}" "platforms;${ANDROID_API_LEVELS}" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}"
 
 RUN yes | sdkmanager --licenses --sdk_root="${ANDROID_HOME}"
-RUN update-java-alternatives -s java-1.11.0-openjdk-amd64
+RUN update-java-alternatives -s java-1.17.0-openjdk-amd64
 
 RUN rm -rf ${ANDROID_HOME}/tools

buildsystem/dependencies.gradle

@@ -37,10 +37,10 @@ allprojects {
 }
 
 ext {
-	androidBuildToolsVersion = "33.0.2"
+	androidBuildToolsVersion = "34.0.0"
 	androidMinSdkVersion = 26
-	androidTargetSdkVersion = 33
-	androidCompileSdkVersion = 33
+	androidTargetSdkVersion = 34
+	androidCompileSdkVersion = 34
 
 	// android and java libs
 	androidVersion = '4.1.1.4'
@@ -62,9 +62,9 @@ ext {
 
 	daggerVersion = '2.51.1'
 
-	gsonVersion = '2.10.1'
+	gsonVersion = '2.11.0'
 
-	okHttpVersion = '4.11.0'
+	okHttpVersion = '4.12.0'
 	okHttpDigestVersion = '3.1.0'
 
 	velocityVersion = '2.3'
@@ -93,7 +93,7 @@ ext {
 	msgraphVersion = '5.47.0'
 	msgraphAuthVersion = '4.0.5' // contains com.microsoft.identity:common lib which added opentelemetry in 9.0.0, do we need to fork another lib before updating to >=4.2.0 ???
 
-	minIoVersion = '8.5.2'
+	minIoVersion = '8.5.10'
 	pcloudVersion = '1.9.2-dev.0001'
 	staxVersion = '1.2.0' // needed for minIO
 	commonsCodecVersion = '1.17.0'
@@ -104,7 +104,7 @@ ext {
 
 	jUnitVersion = '5.10.2'
 	assertJVersion = '1.7.1'
-	mockitoVersion = '5.11.0'
+	mockitoVersion = '5.12.0'
 	mockitoKotlinVersion = '5.3.1'
 	mockitoInlineVersion = '5.2.0'
 	hamcrestVersion = '1.3'

buildsystem/docker/dependencies.txt

@@ -1 +1 @@
-openjdk-11-jdk=11.0.16+8-1
+openjdk-17-jdk=17.0.11+9-1

buildsystem/docker/sources.list

@@ -1,4 +1,4 @@
 # From https://github.com/signalapp/Signal-Android
 
 #deb http://snapshot.debian.org/archive/debian-security/20220816T110409Z/ bullseye/updates main
-deb http://snapshot.debian.org/archive/debian/20220816T041409Z/ unstable main
+deb http://snapshot.debian.org/archive/debian/20240522T144944Z/ unstable main

data/build.gradle

@@ -20,8 +20,8 @@ android {
 	}
 
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_8
-		targetCompatibility JavaVersion.VERSION_1_8
+		sourceCompatibility JavaVersion.VERSION_17
+		targetCompatibility JavaVersion.VERSION_17
 
 		coreLibraryDesugaringEnabled true
 	}

data/src/test/java/org/cryptomator/data/cloud/crypto/MasterkeyCryptoCloudProviderTest.kt

@@ -57,7 +57,7 @@ internal class MasterkeyCryptoCloudProviderTest {
 	private val masterkeyV7 =
 		"{  \"version\": 7,  \"scryptSalt\": \"AAAAAAAAAAA=\",  \"scryptCostParam\": 32768,  \"scryptBlockSize\": 8,  \"primaryMasterKey\": \"D2kc+xBoAcVY+M7s74YBEy6l7ga2+Nz+HS5o0TQY3JMW1uQ5jTlLIQ==\",  \"hmacMasterKey\": \"D2kc+xBoAcVY+M7s74YBEy6l7ga2+Nz+HS5o0TQY3JMW1uQ5jTlLIQ==\",  \"versionMac\": \"cn2sAK6l9p1/w9deJVUuW3h7br056mpv5srvALiYw+g=\"}"
 	private val vaultConfig =
-		"eyJraWQiOiJtYXN0ZXJrZXlmaWxlOm1hc3RlcmtleS5jcnlwdG9tYXRvciIsImFsZyI6IkhTMjU2In0.eyJmb3JtYXQiOjgsInNob3J0ZW5pbmdUaHJlc2hvbGQiOjIyMCwiY2lwaGVyQ29tYm8iOiJTSVZfR0NNIn0.-tDU6GyH7Iv-LAOnFdhpxei2Qyd7DLbx4hfY9Wywc_Y"
+		"eyJraWQiOiJtYXN0ZXJrZXlmaWxlOm1hc3RlcmtleS5jcnlwdG9tYXRvciIsImFsZyI6IkhTMjU2IiwidHlwIjoiSldUIn0.eyJqdGkiOiIiLCJmb3JtYXQiOjgsImNpcGhlckNvbWJvIjoiU0lWX0dDTSIsInNob3J0ZW5pbmdUaHJlc2hvbGQiOjIyMH0.HHMkCqK-kFv_TXAhrzgp8vuPhws_2NswhaAHB9hkKBs"
 
 	private var context: Context = mock()
 	private var cloud: Cloud = mock()

domain/build.gradle

@@ -19,8 +19,8 @@ android {
 	}
 
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_8
-		targetCompatibility JavaVersion.VERSION_1_8
+		sourceCompatibility JavaVersion.VERSION_17
+		targetCompatibility JavaVersion.VERSION_17
 
 		coreLibraryDesugaringEnabled true
 	}

domain/src/main/java/org/cryptomator/domain/usecases/DoLicenseCheck.java

@@ -2,6 +2,7 @@
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.exceptions.JWTDecodeException;
 import com.auth0.jwt.exceptions.SignatureVerificationException;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.auth0.jwt.interfaces.JWTVerifier;
@@ -49,7 +50,7 @@ public LicenseCheck execute() throws BackendException {
 			JWTVerifier verifier = JWT.require(algorithm).build();
 			DecodedJWT jwt = verifier.verify(license);
 			return jwt::getSubject;
-		} catch (SignatureVerificationException | FatalBackendException e) {
+		} catch (SignatureVerificationException | JWTDecodeException | FatalBackendException e) {
 			if (e instanceof SignatureVerificationException && isDesktopSupporterCertificate(license)) {
 				throw new DesktopSupporterCertificateException(license);
 			}

generator-api/build.gradle

@@ -1,9 +1,9 @@
 apply plugin: 'java'
 
 //noinspection GroovyUnusedAssignment
-sourceCompatibility = 1.8
+sourceCompatibility = 17
 //noinspection GroovyUnusedAssignment
-targetCompatibility = 1.8
+targetCompatibility = 17
 
 dependencies {
 	def dependencies = rootProject.ext.dependencies

generator-api/src/main/java/org/cryptomator/generator/Activity.java

@@ -10,8 +10,6 @@
 @Target(TYPE)
 public @interface Activity {
 
-	int layout() default -1;
-
 	boolean secure() default true;
 
 }

generator-api/src/main/java/org/cryptomator/generator/Dialog.java

@@ -10,8 +10,6 @@
 @Target(TYPE)
 public @interface Dialog {
 
-	int value();
-
 	boolean secure() default true;
 
 }

generator-api/src/main/java/org/cryptomator/generator/Fragment.java

@@ -10,6 +10,4 @@
 @Target(TYPE)
 public @interface Fragment {
 
-	int value();
-
 }

generator/build.gradle

@@ -1,9 +1,9 @@
 apply plugin: 'java'
 
 //noinspection GroovyUnusedAssignment
-sourceCompatibility = 1.8
+sourceCompatibility = 17
 //noinspection GroovyUnusedAssignment
-targetCompatibility = 1.8
+targetCompatibility = 17
 
 repositories {
 	mavenCentral()

generator/src/main/java/org/cryptomator/generator/ActivityProcessor.java

@@ -18,7 +18,7 @@
 import javax.tools.JavaFileObject;
 
 @SupportedAnnotationTypes("org.cryptomator.generator.Activity")
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedSourceVersion(SourceVersion.RELEASE_17)
 public class ActivityProcessor extends BaseProcessor {
 
 	@Override

generator/src/main/java/org/cryptomator/generator/CallbackProcessor.java

@@ -22,7 +22,7 @@
 import javax.tools.JavaFileObject;
 
 @SupportedAnnotationTypes("org.cryptomator.generator.Callback")
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedSourceVersion(SourceVersion.RELEASE_17)
 public class CallbackProcessor extends BaseProcessor {
 
 	@Override

generator/src/main/java/org/cryptomator/generator/FragmentProcessor.java

@@ -18,7 +18,7 @@
 import javax.tools.JavaFileObject;
 
 @SupportedAnnotationTypes("org.cryptomator.generator.Fragment")
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedSourceVersion(SourceVersion.RELEASE_17)
 public class FragmentProcessor extends BaseProcessor {
 
 	@Override

generator/src/main/java/org/cryptomator/generator/InstanceStateProcessor.java

@@ -19,7 +19,7 @@
 import javax.tools.JavaFileObject;
 
 @SupportedAnnotationTypes("org.cryptomator.generator.InstanceState")
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedSourceVersion(SourceVersion.RELEASE_17)
 public class InstanceStateProcessor extends BaseProcessor {
 
 	@Override

generator/src/main/java/org/cryptomator/generator/IntentProcessor.java

@@ -22,7 +22,7 @@
 import javax.tools.JavaFileObject;
 
 @SupportedAnnotationTypes("org.cryptomator.generator.Intent")
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedSourceVersion(SourceVersion.RELEASE_17)
 public class IntentProcessor extends BaseProcessor {
 
 	@Override

generator/src/main/java/org/cryptomator/generator/UseCaseProcessor.java

@@ -15,7 +15,7 @@
 import javax.tools.JavaFileObject;
 
 @SupportedAnnotationTypes("org.cryptomator.generator.UseCase")
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedSourceVersion(SourceVersion.RELEASE_17)
 public class UseCaseProcessor extends BaseProcessor {
 
 	@Override

gradle.properties

@@ -3,3 +3,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 android.jetifier.ignorelist=jackson-core,fastdoubleparser
 kapt.incremental.apt=false
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,26 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail