Merge branch 'master' into parallelise-uploads

Author: k0raph

.devcontainer/Dockerfile

@@ -4,7 +4,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 ENV ANDROID_HOME=/usr/lib/android-sdk
 
 RUN apt-get update -y
-RUN apt-get install -y unzip wget openjdk-17-jdk vim
+RUN apt-get install -y unzip wget openjdk-21-jdk vim
 
 RUN wget https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip -O /tmp/commandlinetools.zip
 RUN cd /tmp && unzip commandlinetools.zip

.github/workflows/analysis.yml

@@ -56,11 +56,11 @@ jobs:
                     persist-credentials: false
                     repository: ${{ steps.get-vars.outputs.repo }}
                     ref: ${{ steps.get-vars.outputs.branch }}
-            -   name: Set up JDK 17
-                uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
+            -   name: Set up JDK 21
+                uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
                 with:
                     distribution: "temurin"
-                    java-version: 17
+                    java-version: 21
             -   name: Install dependencies
                 run: |
                     sudo apt install python3-defusedxml

.github/workflows/assembleFlavors.yml

@@ -23,11 +23,11 @@ jobs:
                 flavor: [ Generic, Gplay, Huawei ]
         steps:
             -   uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-            -   name: set up JDK 17
+            -   name: set up JDK 21
                 uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
                 with:
                     distribution: "temurin"
-                    java-version: 17
+                    java-version: 21
             -   uses: gradle/actions/wrapper-validation@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
             -   name: Build ${{ matrix.flavor }}
                 run: |

.github/workflows/check.yml

@@ -23,10 +23,10 @@ jobs:
                 task: [ detekt, spotlessKotlinCheck, lint ]
         steps:
             -   uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-            -   name: Set up JDK 17
+            -   name: Set up JDK 21
                 uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
                 with:
                     distribution: "temurin"
-                    java-version: 17
+                    java-version: 21
             -   name: Check ${{ matrix.task }}
                 run: ./gradlew ${{ matrix.task }}

.github/workflows/codeql.yml

@@ -46,11 +46,11 @@ jobs:
         uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
         with:
           languages: ${{ matrix.language }}
-      - name: Set up JDK 17
-        uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
+      - name: Set up JDK 21
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           distribution: "temurin"
-          java-version: 17
+          java-version: 21
       - name: Assemble
         run: |
           mkdir -p "$HOME/.gradle"

.github/workflows/detectWrongSettings.yml

@@ -21,10 +21,10 @@ jobs:
 
         steps:
             -   uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-            -   name: Set up JDK 17
+            -   name: Set up JDK 21
                 uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
                 with:
                     distribution: "temurin"
-                    java-version: 17
+                    java-version: 21
             -   name: Detect SNAPSHOT
                 run: scripts/analysis/detectWrongSettings.sh

.github/workflows/qa.yml

@@ -29,12 +29,12 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: set up JDK 17
-        uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
+      - name: set up JDK 21
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         if: ${{ steps.check-secrets.outputs.ok == 'true' }}
         with:
           distribution: "temurin"
-          java-version: 17
+          java-version: 21
 
       - name: Build QA
         if: ${{ steps.check-secrets.outputs.ok == 'true' }}

.github/workflows/screenShotTest.yml

@@ -46,7 +46,7 @@ jobs:
             -   uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
                 with:
                     distribution: "temurin"
-                    java-version: 17
+                    java-version: 21
 
             -   name: Enable KVM group perms
                 run: |

.github/workflows/unit-tests.yml

@@ -24,11 +24,11 @@ jobs:
         steps:
             - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
-            - name: Set up JDK 17
+            - name: Set up JDK 21
               uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
               with:
                   distribution: "temurin"
-                  java-version: 17
+                  java-version: 21
 
             - name: Delete old comments
               env:

app/build.gradle.kts

@@ -93,6 +93,12 @@ android {
     androidResources.generateLocaleConfig = true
 
     defaultConfig {
+        testInstrumentationRunnerArguments += mapOf(
+            "TEST_SERVER_URL" to "ncTestServerBaseUrl.toString()",
+            "TEST_SERVER_USERNAME" to "ncTestServerUsername.toString()",
+            "TEST_SERVER_PASSWORD" to "ncTestServerPassword.toString()",
+            "disableAnalytics" to "true"
+        )
         applicationId = "com.nextcloud.client"
         minSdk = 28
         targetSdk = 36
@@ -109,13 +115,6 @@ android {
         testInstrumentationRunner = if (shotTest) "com.karumi.shot.ShotTestRunner"
         else "com.nextcloud.client.TestRunner"
 
-        testInstrumentationRunnerArguments += mapOf(
-            "TEST_SERVER_URL" to ncTestServerBaseUrl.toString(),
-            "TEST_SERVER_USERNAME" to ncTestServerUsername.toString(),
-            "TEST_SERVER_PASSWORD" to ncTestServerPassword.toString()
-        )
-        testInstrumentationRunnerArguments["disableAnalytics"] = "true"
-
         versionCode = versionMajor * 10000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
         versionName = when {
             versionBuild > 89 -> "${versionMajor}.${versionMinor}.${versionPatch}"
@@ -199,8 +198,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     lint {
@@ -241,7 +240,7 @@ kapt.useBuildCache = true
 
 ksp.arg("room.schemaLocation", "$projectDir/schemas")
 
-kotlin.compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
+kotlin.compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
 
 spotless.kotlin {
     target("**/*.kt")
@@ -504,8 +503,9 @@ dependencies {
     "gplayImplementation"(libs.bundles.gplay)
     // endregion
 
-    // region UI
+    // region common
     implementation(libs.ui)
+    implementation(libs.common.core)
     // endregion
 
     // region Image loading