Merge branch 'main' into reading-challenge-widget-design

Author: Williamrai

.github/workflows/android_branch.yml

@@ -34,7 +34,7 @@ jobs:
       env:
         # override default build-tools version (optional)
         BUILD_TOOLS_VERSION: "35.0.0"
-    - uses: actions/upload-artifact@v6
+    - uses: actions/upload-artifact@v7
       name: Upload APK artifact
       with:
         name: app_alpha_release

.github/workflows/android_offline_test.yml

@@ -47,7 +47,7 @@ jobs:
 
       - name: Upload results
         if: ${{ always() }}
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: instrumentation-test-results${{ matrix.api-level }}
           path: ./**/build/reports/androidTests/connected/**

.github/workflows/android_smoke_test.yml

@@ -46,7 +46,7 @@ jobs:
 
     - name: Upload results
       if: ${{ always() }}
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: instrumentation-test-results${{ matrix.api-level }}
         path: ./**/build/reports/androidTests/connected/**