From b80a8aca250442ad003ce9c29d9578846a89dc87 Mon Sep 17 00:00:00 2001
From: Joe Tretter <j.tretter@gmail.com>
Date: Wed, 22 Apr 2026 09:03:47 -0500
Subject: [PATCH] Auto-commit after successful build: improve build setup,
 update docs/config

Changed files:\nREADME.md
SetupBuildEnvironment.sh
app/build.gradle.kts
---
 README.md                |  5 +++++
 SetupBuildEnvironment.sh | 36 ++++++++++++++++++++++++++++++++++++
 app/build.gradle.kts     |  4 ++--
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f12649e..fbad945 100644
--- a/README.md
+++ b/README.md
@@ -70,6 +70,11 @@ bash ./SetupBuildEnvironment.sh --build
 
 the script will also attempt to create a **git commit after a successful build** if there are source changes to commit.
 
+It will also automatically bump the Android app version in `app/build.gradle.kts` before each build by:
+
+- incrementing `versionCode` by 1
+- incrementing the patch component of `versionName` (for example `0.1.0` → `0.1.1`)
+
 ## Next steps toward full GitHug parity
 
 - Expand the Git sandbox to cover merge, rebase, stash, tags, remotes, reset, revert, cherry-pick, bisect, and more
diff --git a/SetupBuildEnvironment.sh b/SetupBuildEnvironment.sh
index d91afb0..ba98be7 100755
--- a/SetupBuildEnvironment.sh
+++ b/SetupBuildEnvironment.sh
@@ -195,6 +195,41 @@ sdk.dir=$SDK_DIR
 EOF_INNER
 }
 
+bump_android_version() {
+  local gradle_file="$PROJECT_DIR/app/build.gradle.kts"
+  if [ ! -f "$gradle_file" ]; then
+    log "No app/build.gradle.kts found; skipping version bump"
+    return
+  fi
+
+  log "Bumping Android app version before build"
+  python - <<PY
+from pathlib import Path
+import re
+
+path = Path(r'''$gradle_file''')
+text = path.read_text()
+
+version_code_match = re.search(r'versionCode\s*=\s*(\d+)', text)
+version_name_match = re.search(r'versionName\s*=\s*"(\d+)\.(\d+)\.(\d+)"', text)
+
+if not version_code_match or not version_name_match:
+    raise SystemExit('Could not find versionCode/versionName in app/build.gradle.kts')
+
+current_code = int(version_code_match.group(1))
+major, minor, patch = map(int, version_name_match.groups())
+
+new_code = current_code + 1
+new_name = f'{major}.{minor}.{patch + 1}'
+
+text = re.sub(r'versionCode\s*=\s*\d+', f'versionCode = {new_code}', text, count=1)
+text = re.sub(r'versionName\s*=\s*"\d+\.\d+\.\d+"', f'versionName = "{new_name}"', text, count=1)
+
+path.write_text(text)
+print(f'Updated versionCode to {new_code} and versionName to {new_name}')
+PY
+}
+
 setup_env() {
   setup_java_env
   export ANDROID_HOME="$SDK_DIR"
@@ -239,6 +274,7 @@ maybe_build() {
   fi
 
   setup_env
+  bump_android_version
   log "Building debug APK with --no-daemon"
   "$PROJECT_DIR/gradlew" --no-daemon assembleDebug
   auto_commit_if_needed
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1e8773b..9a1c033 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,8 +11,8 @@ android {
         applicationId = "com.kawomi.githugandroid"
         minSdk = 26
         targetSdk = 34
-        versionCode = 1
-        versionName = "0.1.0"
+        versionCode = 2
+        versionName = "0.1.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true