Fix version code: Version code must be in build.gradle.kts for f-droi…

…d version checker to work
bailuk · Apr 28, 2024 · 828b825 · 828b825
1 parent 258f466
commit 828b825
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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