From d563a12f113d997f5691bff278d48a78dea4ca14 Mon Sep 17 00:00:00 2001
From: jahruz67 <reeman360@gmail.com>
Date: Thu, 21 May 2026 23:03:25 -0700
Subject: [PATCH] Refactor Android build process to support update-compatible
 APKs and add shared debug keystore configuration

---
 .github/workflows/android-build.yml         |   8 +-------
 app/build.gradle                            |  18 ++++++++++++++++++
 app/signing/README.md                       |   3 +++
 app/signing/bible-daily-debug.keystore      | Bin 0 -> 2618 bytes
 build/reports/problems/problems-report.html |   2 +-
 5 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 app/signing/README.md
 create mode 100644 app/signing/bible-daily-debug.keystore

diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
index da5d00d..2a12a48 100644
--- a/.github/workflows/android-build.yml
+++ b/.github/workflows/android-build.yml
@@ -26,16 +26,10 @@ jobs:
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v4
 
-      - name: Cache Android debug keystore
-        uses: actions/cache@v4
-        with:
-          path: ~/.android/debug.keystore
-          key: android-debug-keystore-${{ runner.os }}
-
       - name: Make Gradle wrapper executable
         run: chmod +x gradlew
 
-      - name: Build debug APK
+      - name: Build update-compatible APK
         run: ./gradlew assembleDebug -PciVersionCode=${{ github.run_number }} -PciVersionName=1.0.${{ github.run_number }}
 
       - name: Prepare release assets
diff --git a/app/build.gradle b/app/build.gradle
index 72d0204..4341226 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,11 +4,21 @@ plugins {
 
 def ciVersionCode = providers.gradleProperty("ciVersionCode").getOrNull()
 def ciVersionName = providers.gradleProperty("ciVersionName").getOrNull()
+def sharedDebugKeystore = file("signing/bible-daily-debug.keystore")
 
 android {
     namespace "com.bibliadiaria.app"
     compileSdk 35
 
+    signingConfigs {
+        sharedDebug {
+            storeFile sharedDebugKeystore
+            storePassword "android"
+            keyAlias "androiddebugkey"
+            keyPassword "android"
+        }
+    }
+
     defaultConfig {
         applicationId "com.bibliadiaria.app"
         minSdk 23
@@ -17,6 +27,14 @@ android {
         versionName ciVersionName != null ? ciVersionName : "1.0"
     }
 
+    buildTypes {
+        debug {
+            if (sharedDebugKeystore.exists()) {
+                signingConfig signingConfigs.sharedDebug
+            }
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
diff --git a/app/signing/README.md b/app/signing/README.md
new file mode 100644
index 0000000..1dc0325
--- /dev/null
+++ b/app/signing/README.md
@@ -0,0 +1,3 @@
+This debug keystore is intentionally shared by local and GitHub Actions builds so sideloaded APK updates keep the same Android signing identity.
+
+Do not use this key for Play Store or production release signing.
diff --git a/app/signing/bible-daily-debug.keystore b/app/signing/bible-daily-debug.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..dd872c689b50c98b0a39b5f647b754f2ac223103
GIT binary patch
literal 2618
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

literal 0
HcmV?d00001

diff --git a/build/reports/problems/problems-report.html b/build/reports/problems/problems-report.html
index 085cc1c..ae3aa1c 100644
--- a/build/reports/problems/problems-report.html
+++ b/build/reports/problems/problems-report.html
@@ -650,7 +650,7 @@ code + .copy-button {
 <script type="text/javascript">
 function configurationCacheProblems() { return (
 // begin-report-data
-{"diagnostics":[{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('namespace = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('compileSdk = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('minSdk = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('targetSdk = <value>') instead."}]]},{"locations":[{"path":"C:\\Users\\360he\\Documents\\Bible app\\app\\src\\main\\java\\com\\bibliadiaria\\app\\ExtrasActivity.java"},{"taskPath":":app:compileDebugJavaWithJavac"}],"problem":[{"text":"Some input files use or override a deprecated API."}],"severity":"ADVICE","problemDetails":[{"text":"Note: Some input files use or override a deprecated API."}],"contextualLabel":"Some input files use or override a deprecated API.","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler.note.deprecated.plural","displayName":"Some input files use or override a deprecated API."}]},{"locations":[{"path":"C:\\Users\\360he\\Documents\\Bible app\\app\\src\\main\\java\\com\\bibliadiaria\\app\\ExtrasActivity.java"},{"taskPath":":app:compileDebugJavaWithJavac"}],"problem":[{"text":"Recompile with -Xlint:deprecation for details."}],"severity":"ADVICE","problemDetails":[{"text":"Note: Recompile with -Xlint:deprecation for details."}],"contextualLabel":"Recompile with -Xlint:deprecation for details.","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler.note.deprecated.recompile","displayName":"Recompile with -Xlint:deprecation for details."}]}],"problemsReport":{"totalProblemCount":6,"buildName":"Biblia Diaria","requestedTasks":"assembleDebug","documentationLink":"https://docs.gradle.org/9.0.0/userguide/reporting_problems.html","documentationLinkCaption":"Problem report","summaries":[]}}
+{"diagnostics":[{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('namespace = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('compileSdk = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('minSdk = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('targetSdk = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('signingConfig = <value>') instead."}]]}],"problemsReport":{"totalProblemCount":5,"buildName":"Biblia Diaria","requestedTasks":"assembleDebug","documentationLink":"https://docs.gradle.org/9.0.0/userguide/reporting_problems.html","documentationLinkCaption":"Problem report","summaries":[]}}
 // end-report-data
 );}
 </script>