From 828b825541402cb1662e7a58350bf043a58c39ce Mon Sep 17 00:00:00 2001
From: bailuk <bailu@bailu.ch>
Date: Sun, 28 Apr 2024 21:03:10 +0200
Subject: [PATCH] Fix version code: Version code must be in build.gradle.kts
 for f-droid version checker to work

---
 aat-android/build.gradle.kts                                  | 4 +++-
 .../src/main/kotlin/ch/bailu/aat/app/AndroidAppConfig.kt      | 3 +++
 aat-lib/src/main/java/ch/bailu/aat_lib/Configuration.kt       | 1 -
 aat-lib/src/main/java/ch/bailu/aat_lib/app/AppConfig.kt       | 2 +-
 gradle.properties                                             | 1 -
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/aat-android/build.gradle.kts b/aat-android/build.gradle.kts
index a8c188282..a4d74c454 100644
--- a/aat-android/build.gradle.kts
+++ b/aat-android/build.gradle.kts
@@ -21,7 +21,9 @@ android {
     defaultConfig {
         minSdk = 22
         targetSdk = 33
-        versionCode = 37
+
+        // Version Code can not be taken from from variable (f-droid version checker fail)
+        versionCode = 38
         versionName = appVersionName
         applicationId = appId
     }
diff --git a/aat-android/src/main/kotlin/ch/bailu/aat/app/AndroidAppConfig.kt b/aat-android/src/main/kotlin/ch/bailu/aat/app/AndroidAppConfig.kt
index 7d4565c93..13ecf0fa9 100644
--- a/aat-android/src/main/kotlin/ch/bailu/aat/app/AndroidAppConfig.kt
+++ b/aat-android/src/main/kotlin/ch/bailu/aat/app/AndroidAppConfig.kt
@@ -5,4 +5,7 @@ import ch.bailu.aat_lib.app.AppConfig
 
 class AndroidAppConfig : AppConfig() {
     override val isRelease = !BuildConfig.DEBUG
+
+    // Version Code can not be taken from from variable (f-droid version checker fail)
+    override val appVersionCode = BuildConfig.VERSION_CODE
 }
diff --git a/aat-lib/src/main/java/ch/bailu/aat_lib/Configuration.kt b/aat-lib/src/main/java/ch/bailu/aat_lib/Configuration.kt
index d5a46f5c9..9247e9b74 100644
--- a/aat-lib/src/main/java/ch/bailu/aat_lib/Configuration.kt
+++ b/aat-lib/src/main/java/ch/bailu/aat_lib/Configuration.kt
@@ -10,7 +10,6 @@ object Configuration {
     const val appContact = "aat@bailu.ch"
     const val mapsForgeVersion = "0.20.0"
     const val appVersionName = "v1.25"
-    const val appVersionCode = "38"
     const val focVersion = "1.3"
     const val appCopyright = "© 2011-2024 Lukas Bai, GNU GPLv3 or later\n© Map and data OSM contributors ODbL 1.0"
     const val appId = "ch.bailu.aat"
diff --git a/aat-lib/src/main/java/ch/bailu/aat_lib/app/AppConfig.kt b/aat-lib/src/main/java/ch/bailu/aat_lib/app/AppConfig.kt
index 06c7234b7..5bb119d5e 100644
--- a/aat-lib/src/main/java/ch/bailu/aat_lib/app/AppConfig.kt
+++ b/aat-lib/src/main/java/ch/bailu/aat_lib/app/AppConfig.kt
@@ -15,7 +15,7 @@ abstract class AppConfig : WithStatusText {
     open val appVersionName: String
         get() = Configuration.appVersionName
     open val appVersionCode: Int
-        get() = Configuration.appVersionCode.toInt()
+        get() = 0
     val appWebsite: String
         get() = Configuration.appWebsite
     val appCopyright: String
diff --git a/gradle.properties b/gradle.properties
index 0e0549ff7..4a32142b3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,6 @@ appLongName=AAT Activity Tracker
 appContact=aat@bailu.ch
 appVersionName=v1.25
 appWebsite=https://github.com/bailuk/AAT
-appVersionCode=38
 appId=ch.bailu.aat
 
 appCopyright=© 2011-2024 Lukas Bai, GNU GPLv3 or later\\n© Map and data OSM contributors ODbL 1.0