Merge pull request #13634 from nextcloud/repo-sync/android-config/master

🔄 synced file(s) with nextcloud/android-config

.github/workflows/analysis.yml

@@ -24,7 +24,7 @@ concurrency:
 
 jobs:
     analysis:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-24.04
         steps:
             -   name: Setup variables
                 id: get-vars
@@ -48,14 +48,14 @@ jobs:
                 with:
                     repository: ${{ steps.get-vars.outputs.repo }}
                     ref: ${{ steps.get-vars.outputs.branch }}
-            -   name: Set up JDK 17
+            -   name: Set up JDK 21
                 uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
                 with:
                     distribution: "temurin"
-                    java-version: 17
+                    java-version: 21
             -   name: Install dependencies
                 run: |
-                    python3 -m pip install defusedxml
+                    sudo apt install python3-defusedxml
             -   name: Run analysis wrapper
                 env:
                     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/codeql.yml

@@ -22,7 +22,7 @@ permissions:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       actions: read
       contents: read
@@ -42,11 +42,11 @@ jobs:
         uses: github/codeql-action/init@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
         with:
           languages: ${{ matrix.language }}
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
         with:
           distribution: "temurin"
-          java-version: 17
+          java-version: 21
       - name: Assemble
         run: |
           mkdir -p "$HOME/.gradle"