Release test build to Android beta program

diff --git a/.gitignore b/.gitignore
index 33d764f763e062b7eaa476b1b2ded1f1e2745d2e..52f8bc4f4a52e42730042c1696ab56501cd56538 100644 (file)
--- 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 c4de09bf8aaebbd0003d02192a97a0afba7e5010..6e67030ba0e2a4bb3df7b8ca8a95f2a38cd8cbe1 100644 (file)
--- 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 ad1c9e1cd4091d8f3d4f79b6d201e3fd6c22b5b3..58509198a9b6d7b3de2d9cbadd6260bd3127f787 100755 (executable)
--- 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