Merge remote-tracking branch 'upstream/main'

.github/workflows/code-format.yml

@@ -0,0 +1,35 @@
+name: Code Format
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+jobs:
+  spotless:
+    name: Check code format (Spotless)
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
+        with:
+          java-version: 17
+          distribution: temurin
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Validate Gradle Wrapper
+        uses: gradle/actions/wrapper-validation@v4
+      - name: Check formatting
+        run: ./gradlew spotlessCheck

.github/workflows/preview-apk.yml

@@ -14,16 +14,15 @@ jobs:
       - uses: actions/checkout@v5
         with:
           submodules: recursive
+
       - name: Validate Fastlane Metadata
         uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2
-      - uses: Swatinem/rust-cache@v2
-        with:
-          working-directory: jni/deltachat-core-rust
+
       - uses: actions/setup-java@v5
         with:
           java-version: 17
           distribution: 'temurin'
-      - uses: android-actions/setup-android@v3
+
       - uses: actions/cache@v4
         with:
           path: |
@@ -32,13 +31,32 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/actions/wrapper-validation@v4
+
+      - uses: android-actions/setup-android@v3
       - uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
           ndk-version: r27
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v4
+      - uses: Swatinem/rust-cache@v2
+        with:
+          working-directory: jni/deltachat-core-rust
+
+      - name: Get deltachat-core-rust submodule hash
+        id: core-hash
+        run: echo "hash=$(git rev-parse HEAD:jni/deltachat-core-rust)" >> $GITHUB_OUTPUT
+
+      - name: Cache compiled core
+        id: cache-core
+        uses: actions/cache@v4
+        with:
+          path: |
+            jni/arm64-v8a
+            libs/arm64-v8a
+          key: core-arm64-v8a-${{ steps.core-hash.outputs.hash }}-${{ hashFiles('jni/Android.mk', 'jni/Application.mk', 'jni/dc_wrapper.c', 'scripts/ndk-make.sh') }}-ndk-r27
 
       - name: Compile core
         env: