From 3014e8b33b3d14165cc207be13631f4ee9a8fd2e Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Thu, 25 Jun 2020 15:36:51 +0100
Subject: [PATCH] Release test build to Android beta program

---
 .gitignore                 | 2 ++
 build/android/build.gradle | 2 +-
 util/bump_version.sh       | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 33d764f76..52f8bc4f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -104,3 +104,5 @@ cmake_config.h
 cmake_config_githash.h
 CMakeDoxy*
 compile_commands.json
+*.apk
+*.zip
diff --git a/build/android/build.gradle b/build/android/build.gradle
index c4de09bf8..6e67030ba 100644
--- a/build/android/build.gradle
+++ b/build/android/build.gradle
@@ -4,7 +4,7 @@ project.ext.set("versionMajor", 5)      // Version Major
 project.ext.set("versionMinor", 3)      // Version Minor
 project.ext.set("versionPatch", 0)      // Version Patch
 project.ext.set("versionExtra", "-dev") // Version Extra
-project.ext.set("versionCode", 26)      // Android Version Code
+project.ext.set("versionCode", 28)      // Android Version Code
 // NOTE: +2 after each release!
 // +1 for ARM and +1 for ARM64 APK's, because
 // each APK must have a larger `versionCode` than the previous
diff --git a/util/bump_version.sh b/util/bump_version.sh
index ad1c9e1cd..58509198a 100755
--- a/util/bump_version.sh
+++ b/util/bump_version.sh
@@ -90,7 +90,8 @@ RELEASE_VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
 echo "Current Minetest version: $RELEASE_VERSION"
 echo "Current Android version code: $ANDROID_VERSION_CODE"
 
-NEW_ANDROID_VERSION_CODE=$(expr $ANDROID_VERSION_CODE + 1)
+# +1 for ARM and +1 for ARM64 APKs
+NEW_ANDROID_VERSION_CODE=$(expr $ANDROID_VERSION_CODE + 2)
 NEW_ANDROID_VERSION_CODE=$(prompt_for_number "Set android version code" $NEW_ANDROID_VERSION_CODE)
 
 echo
-- 
2.25.1