From 222359692e0b23613d57f88ee8d288dae3b8662e Mon Sep 17 00:00:00 2001 From: Uriel Date: Wed, 13 Nov 2024 22:08:56 +0100 Subject: [PATCH] Support not having git for making android builds (#1237) --- server/.gitignore | 4 ++++ server/android/build.gradle.kts | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/server/.gitignore b/server/.gitignore index e97171823..89916e7f5 100644 --- a/server/.gitignore +++ b/server/.gitignore @@ -19,3 +19,7 @@ Load AutoBone Recordings *.log.lck *.log logs/ + +android/release +android/debug + diff --git a/server/android/build.gradle.kts b/server/android/build.gradle.kts index 27d8b99f3..7dd94c33a 100644 --- a/server/android/build.gradle.kts +++ b/server/android/build.gradle.kts @@ -124,11 +124,14 @@ android { // Specifies the API level used to test the app. targetSdk = 35 + // adds an offset of the version code as we might do apk releases in the middle of actual + // releases if we failed on bundling or stuff + val versionCodeOffset = 1 // Defines the version number of your app. - versionCode = extra["gitVersionCode"] as? Int + versionCode = (extra["gitVersionCode"] as? Int)?.plus(versionCodeOffset) ?: 0 // Defines a user-friendly version name for your app. - versionName = extra["gitVersionName"] as? String + versionName = extra["gitVersionName"] as? String ?: "v0.0.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" }