update build and gradle

.github/workflows/build.yml

@@ -26,11 +26,13 @@ jobs:
       - uses: actions/checkout@v7
         with:
           submodules: true
-          fetch-depth: 0 
+          fetch-depth: 0
+
       - name: Make script executable
         run: chmod +x ./patch_submodule.sh
       - name: Run patch submodule script
         run: ./patch_submodule.sh
+
       - name: set up secrets
         run: |
           echo "${{ secrets.RELEASE_KEYSTORE }}" > keystore.asc
@@ -49,14 +51,32 @@ jobs:
         with:
           java-version: 21
           distribution: "temurin"
-          cache: 'gradle'
+
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v6
 
+      # Scoped to :app so the upstream KeePassDX submodule tests do not gate this build.
+      - name: Run unit tests
+        run: ./gradlew :app:testDebugUnitTest
+
       - name: Build APK
         run: |
           VERSION_CODE=$(git rev-list --count HEAD)
-          ./gradlew assembleSignedRelease -PVERSION_CODE=$VERSION_CODE
+          VERSION_BASE=$(git describe --tags --abbrev=0 | sed 's/^v//')
+          VERSION_DEV=$(git rev-list --count $(git describe --tags --abbrev=0)..HEAD)
+          if [ $VERSION_DEV -gt 0 ]; then
+            VERSION_NAME="${VERSION_BASE}.${VERSION_DEV}"
+          else
+            VERSION_NAME="${VERSION_BASE}"
+          fi
+          ./gradlew assembleSignedRelease -PVERSION_CODE=$VERSION_CODE -PVERSION_NAME=$VERSION_NAME
+
+      - name: Upload APK
+        uses: actions/upload-artifact@v7
+        with:
+          path: app/build/outputs/apk/signedRelease/app-signedRelease.apk
+          compression-level: 0
+          archive: false
 
       - name: Release
         uses: softprops/action-gh-release@v3
@@ -70,4 +90,3 @@ jobs:
             else
               echo "true"
             fi
-