Update sqlcipher for Android and migrate to fork of cwac-saferoom; project structure and documentation; increment version numbers; improve CI configurations

Author: softartdev

.github/workflows/android.yml

@@ -6,37 +6,6 @@ on:
       - android/*
 
 jobs:
-  ui_test_job:
-    name: UI-tests on emulator
-    runs-on: macos-latest
-    continue-on-error: true
-    strategy:
-      fail-fast: false
-      matrix:
-        api-level: [ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36 ]
-    steps:
-      - name: Check out
-        uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'oracle'
-          java-version: 17
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          cache-read-only: false
-          cache-overwrite-existing: true
-      - name: Decrypt large secret
-        run: ./.github/scripts/decrypt_secret.sh
-        env:
-          LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
-      - name: Run UI-tests on emulator
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ matrix.api-level }}
-          target: google_apis
-          script: ./gradlew :app:android:connectedCheck
   build_unit_test_publish_job:
     name: Build -> Unit-test -> Publish
     needs: ui_test_job
@@ -58,7 +27,7 @@ jobs:
         run: ./.github/scripts/decrypt_secret.sh
         env:
           LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
-      - name: Upload to Google Play
+      - name: Build and Upload to Google Play
         working-directory: ./app/android
         run: fastlane build_bundle_publish
       - name: Archive build artifacts

.github/workflows/kmp.yml

@@ -28,12 +28,17 @@ jobs:
         with:
           cache-read-only: false
           cache-overwrite-existing: true
-      - name: Build (first attempt)
-        id: build
+      - name: Build (1st attempt)
+        id: build_1
         continue-on-error: true
         run: ./gradlew build
-      - name: Build (retry on failure)
-        if: ${{ steps.build.outcome == 'failure' }}
+      - name: Build (2nd attempt)
+        id: build_2
+        if: ${{ steps.build_1.outcome == 'failure' }}
+        continue-on-error: true
+        run: ./gradlew build
+      - name: Build (3rd attempt)
+        if: ${{ steps.build_2.outcome == 'failure' }}
         run: ./gradlew build
       - name: Archive build-output artifacts
         if: always()
@@ -111,4 +116,4 @@ jobs:
           name: output-ui-tests-artifacts-${{ matrix.api-level }}-${{ matrix.target }}
           path: |
             app/android/build/outputs
-            app/android/build/reports
+            app/android/build/reports

AGENTS.md

@@ -24,8 +24,8 @@ android {
         applicationId = "com.softartdev.noteroom"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
-        versionCode = 840
-        versionName = "8.4.0"
+        versionCode = 841
+        versionName = "8.4.1"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments["clearPackageData"] = "true"
         vectorDrawables.useSupportLibrary = true
@@ -64,6 +64,7 @@ android {
         emulatorControl.enable = true
     }
     androidResources.generateLocaleConfig = true
+    lint.disable += "Aligned16KB"  // Workaround for AGP 8.13.0 PageAlignmentDetector bug
 }
 
 dependencies {

README.md

@@ -49,7 +49,7 @@ compose.desktop {
         nativeDistributions {
             targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
             packageName = "Note Delight"
-            packageVersion = "2.1.0"
+            packageVersion = "3.0.0"
             description = "Note app with encryption"
             copyright = "© 2023 SoftArtDev"
             macOS.iconFile.set(project.file("src/jvmMain/resources/app_icon.icns"))

app/android/build.gradle.kts

@@ -475,7 +475,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1;
+				MARKETING_VERSION = 3.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -517,7 +517,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1;
+				MARKETING_VERSION = 3.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

app/android/src/main/jniLibs/.gitkeep

@@ -22,7 +22,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1</string>
+	<string>3.0</string>
 	<key>CFBundleVersion</key>
 	<string>17</string>
 	<key>LSRequiresIPhoneOS</key>