Merge pull request 'Update plugin org.jetbrains.kotlin.android to v2.4.0' (#282) from renovate/org.jetbrains.kotlin.android-2.x into main

.github/workflows/build.yml

@@ -26,6 +26,7 @@ jobs:
       - uses: actions/checkout@v6
         with:
           submodules: true
+          fetch-depth: 0 
       - name: Make script executable
         run: chmod +x ./patch_submodule.sh
       - name: Run patch submodule script
@@ -53,17 +54,20 @@ jobs:
         uses: gradle/actions/setup-gradle@v6
 
       - name: Build APK
-        run: ./gradlew assemble
-
-      # - name: Upload APK
-      #   uses: actions/upload-artifact@v4
-      #   with:
-      #     name: app.apk
-      #     path: app/build/outputs/apk/release/app-release.apk
+        run: |
+          VERSION_CODE=$(git rev-list --count HEAD)
+          ./gradlew assembleSignedRelease -PVERSION_CODE=$VERSION_CODE
 
       - name: Release
         uses: softprops/action-gh-release@v3
         if: startsWith(github.ref, 'refs/tags/')
         with:
           files: |
-            app/build/outputs/apk/release/app-release.apk
+            app/build/outputs/apk/signedRelease/app-signedRelease.apk
+          prerelease: |
+            if [[ ${{ github.ref }} =~ ^refs/tags/[0-9]+\.[0-9]+[a-z]+$ ]]; then
+              echo "false"
+            else
+              echo "true"
+            fi
+

README.md

@@ -3,13 +3,15 @@
   <h1>Keepass Fidelity</h1>
   <img width="100px" src="./metadata/en-US/images/icon.png" alt="Logo">
   
-  <p>A minimalist fidelity/loyalty card plugin</p>
-  
+  <p>A minimalist fidelity/loyalty card app with Keepass Database storage</p>
+
+  <a href="https://ko-fi.com/I2I615VP5M"><img src="https://ko-fi.com/img/githubbutton_sm.svg" alt="ko-fi"></a>
+  <br>
   <img src="https://forthebadge.com/images/badges/built-for-android.svg" alt="Built for Android">
   <img src="https://forthebadge.com/images/badges/built-with-love.svg" alt="Built with love">
   <br>
-    <a href="https://github.com/choelzl/keepass-fidelity/actions/workflows/build.yml">
-    <img src="https://github.com/choelzl/keepass-fidelity/actions/workflows/build.yml/badge.svg?branch=main" alt="Build Status">
+    <a href="https://github.com/helcel-net/keepass-fidelity/actions/workflows/build.yml">
+    <img src="https://github.com/helcel-net/keepass-fidelity/actions/workflows/build.yml/badge.svg?branch=main" alt="Build Status">
   </a>
 </div>
 
@@ -27,7 +29,7 @@
 
 ## ⭐ Features
 
-- Search entries in [Keepass2Android](https://github.com/PhilippC/keepass2android/)
+- Search entries in Keepass Database
 - Scan & Create entries
 - Recently used history for fast access
 - Protect entries from caching
@@ -40,7 +42,7 @@
     <a href="https://apt.izzysoft.de/fdroid/index/apk/net.helcel.fidelity">
         <img width="200" height="80" alt="Izzy Download" src=".github/images/izzy.png">
     </a>
-    <a href="https://github.com/choelzl/keepass-fidelity/releases/latest">
+    <a href="https://github.com/helcel-net/keepass-fidelity/releases/latest">
         <img width="200" height="84" alt="APK Download" src=".github/images/apk.png">
     </a>
 </div>
@@ -66,7 +68,7 @@ Thanks to all contributors, the developers of our dependencies, and our users.
 ## 📝 License
 
 ```
-Copyright (C) 2024 Helcel
+Copyright (C) 2026 Helcel
 
 Licensed under the Unlicense
 For more information, please refer to <https://unlicense.org>

app/build.gradle

@@ -20,11 +20,12 @@ plugins {
 android {
     namespace 'net.helcel.fidelity'
     compileSdk = 37
+    ndkVersion "25.2.9519653" //Match this to KeypassDX crypto NDK version
 
     defaultConfig {
         applicationId 'net.helcel.fidelity'
-        versionName "1.3"
-        versionCode getCommitCount()
+        versionName "1.3b"
+        versionCode project.hasProperty('VERSION_CODE') ? project.property('VERSION_CODE').toInteger() : 1
         buildConfigField("String", "APP_NAME", "\"Keepass Fidelity\"")
         manifestPlaceholders["APP_NAME"] = "Keepass Fidelity"
         minSdk = 28

build.gradle

@@ -9,6 +9,6 @@ buildscript {
 plugins {
     id 'com.android.application' version '9.2.1' apply false
     id 'com.android.library' version '9.2.1' apply false
-    id 'org.jetbrains.kotlin.android' version '2.3.21' apply false
-    id 'com.autonomousapps.dependency-analysis' version '3.13.0' apply true
+    id 'org.jetbrains.kotlin.android' version '2.4.0' apply false
+    id 'com.autonomousapps.dependency-analysis' version '3.14.1' apply true
 }

metadata/en-US/full_description.txt

@@ -1 +1 @@
-<p><i>Keepass-Fidelity</i> adds an interface to view/save barcodes (QR included) to Keepass through the plugin interface of the Keepass2Android app.</p><p><br></p><ul><li><b>Launcher:</b> view and launch recent entries (a per entry flag can disable this behaviour)</li><li><b>View:</b> view entries from the history or queried from Keepass2Android</li><li><b>Create:</b> add entries from the camera, an image of by filling out a form. The entry is then created in the Keepass2Android app</li><li><b>Data:</b> the app uses the following data Title (entry name), barcode type (QR, UPC, ...), barcode content (number/text content) and a "secure" flag (enable/disable caching the entry).</li></ul>
+<p><i>Keepass-Fidelity</i> adds an interface to view&save barcodes (QR included) with a Keepass Database.</p><p><br></p><ul><li><b>Launcher:</b> view and launch recent entries (a per entry flag can disable this behaviour)</li><li><b>View:</b> view entries from loaded from the database</li><li><b>Create:</b> add entries from the camera, an image of by filling out a form. The entry is then created in the database</li><li><b>Data:</b> the app uses the following data Title (entry name), barcode type (QR, UPC, ...), barcode content (number/text content) and a "secure" flag (enable/disable caching the entry).</li></ul>

metadata/en-US/short_description.txt

@@ -1 +1 @@
-Fidelity (Membership/Loyalty) Card plugin for Keepass2Android
+Fidelity (Membership/Loyalty) Card app with Keepass Database Storage