Upgrade sdks and refactor app version storing

Simon Schubert · Simon Schubert · commit 1c706c8758b4 · 2025-05-18T10:46:29.000+02:00
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ![Icon](https://raw.githubusercontent.com/SimonSchubert/LinuxCommandLibrary/master/art/web_hi_res_144.png)
 
-The app currently has **6724** manual pages, **22+** basic categories and a bunch of general terminal tips. It works 100% offline, doesn't need an internet connection and has no tracking software.
+The app currently has **6766** manual pages, **22+** basic categories and a bunch of general terminal tips. It works 100% offline, doesn't need an internet connection and has no tracking software.
 
 [![Play Store](https://raw.githubusercontent.com/SimonSchubert/LinuxCommandBibliotheca/master/art/play_store_badge.png)](https://play.google.com/store/apps/details?id=com.inspiredandroid.linuxcommandbibliotheca)
 [![F-Droid](https://raw.githubusercontent.com/SimonSchubert/LinuxCommandBibliotheca/master/art/fdroid_badge.png)](https://f-droid.org/en/packages/com.inspiredandroid.linuxcommandbibliotheca/)
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
@@ -5,7 +5,6 @@ plugins {
 }
 
 group = "com.inspiredandroid.linuxcommandbibliotheca"
-version = parent!!.version
 
 repositories {
     mavenCentral()
@@ -39,8 +38,11 @@ android {
         applicationId = "com.inspiredandroid.linuxcommandbibliotheca"
         minSdk = 24
         targetSdk = 35
-        versionCode = 103
-        versionName = project.version.toString()
+        versionCode =
+            libs.versions.androidVersionCode
+                .get()
+                .toInt()
+        versionName = libs.versions.appVersion.get()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/ui/screens/AppInfoDialog.kt b/android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/ui/screens/AppInfoDialog.kt
@@ -30,9 +30,9 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
-import com.inspiredandroid.linuxcommandbibliotheca.BuildConfig
 import com.inspiredandroid.linuxcommandbibliotheca.R
 import com.inspiredandroid.linuxcommandbibliotheca.ui.theme.LinuxTheme
+import com.linuxcommandlibrary.shared.*
 
 /* Copyright 2022 Simon Schubert
  *
@@ -91,7 +91,7 @@ fun AppInfoDialog(
                     }
                 }
                 Text(
-                    "Version: ${BuildConfig.VERSION_NAME}",
+                    "Version: ${Version.appVersion}",
                     style = MaterialTheme.typography.caption,
                     modifier = Modifier.padding(8.dp),
                 )
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -20,7 +20,6 @@ buildscript {
 }
 
 group = "com.inspiredandroid"
-version = "3.3.9"
 
 allprojects {
     repositories {
diff --git a/cli/src/main/kotlin/com/linuxcommandlibrary/cli/ConsoleApplication.kt b/cli/src/main/kotlin/com/linuxcommandlibrary/cli/ConsoleApplication.kt
@@ -1,7 +1,7 @@
 package com.linuxcommandlibrary.cli
 
+import com.linuxcommandlibrary.shared.Version
 import com.linuxcommandlibrary.shared.databaseHelper
-import com.linuxcommandlibrary.shared.getCurrentVersion
 import com.linuxcommandlibrary.shared.initDatabase
 import com.linuxcommandlibrary.shared.sortedSearch
 import kotlin.system.exitProcess
@@ -27,7 +27,7 @@ fun showIntro() {
     println(" _     _ _____ _____   ____  _____ __  __")
     println("| |__ | || () )| () ) / () \\ | () )\\ \\/ /")
     println("|____||_||_()_)|_|\\_\\/__/\\__\\|_|\\_\\ |__|")
-    println("Version: ${getCurrentVersion()}")
+    println("Version: ${Version.appVersion}")
 }
 
 fun showStartMenu() {
diff --git a/cli/src/main/resources/application.properties b/cli/src/main/resources/application.properties
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -11,7 +11,6 @@ plugins {
 }
 
 group = "com.linuxcommandlibrary"
-version = "1.0"
 
 kotlin {
     androidTarget()
@@ -28,6 +27,7 @@ kotlin {
             dependencies {
                 implementation(libs.runtime)
             }
+            kotlin.srcDir(layout.buildDirectory.dir("generated/src/commonMain/kotlin"))
         }
         commonTest {
             dependencies {
@@ -72,3 +72,27 @@ sqldelight {
         }
     }
 }
+
+class VersionGeneratorPlugin : Plugin<Project> {
+    override fun apply(project: Project) {
+        project.afterEvaluate {
+            val versionFile =
+                layout.buildDirectory
+                    .file("generated/src/commonMain/kotlin/com/linuxcommandlibrary/shared/Version.kt")
+                    .get()
+                    .asFile
+            versionFile.parentFile?.mkdirs()
+            versionFile.writeText(
+                """
+                package com.linuxcommandlibrary.shared
+
+                object Version {
+                    const val appVersion = "${libs.versions.appVersion.get()}"
+                }
+                """.trimIndent(),
+            )
+        }
+    }
+}
+
+apply<VersionGeneratorPlugin>()
diff --git a/common/src/jvmMain/kotlin/com/linuxcommandlibrary/shared/Platform.kt b/common/src/jvmMain/kotlin/com/linuxcommandlibrary/shared/Platform.kt
@@ -4,8 +4,6 @@ import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver
 import com.linuxcommandlibrary.CommandDatabase
 import java.io.File
-import java.io.IOException
-import java.util.Properties
 
 /* Copyright 2022 Simon Schubert
  *
@@ -32,14 +30,3 @@ fun initDatabase() {
     }
     databaseHelper.setupDriver(driver)
 }
-
-fun getCurrentVersion(): String {
-    val prop = Properties()
-    try {
-        val input = EmptyClass::class.java.classLoader?.getResource("application.properties")
-        prop.load(input?.openStream())
-    } catch (io: IOException) {
-        io.printStackTrace()
-    }
-    return prop["version"].toString()
-}
diff --git a/fastlane/metadata/android/en-US/changelogs/104.txt b/fastlane/metadata/android/en-US/changelogs/104.txt
@@ -0,0 +1,2 @@
+Add commands
+Upgrade sdks
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
@@ -1,4 +1,4 @@
-The app currently has <b>6724</b> manual pages, <b>22</b> basic categories and a bunch of general terminal tips. It works 100% offline, doesn't need an internet connection and has no tracking software.
+The app currently has <b>6766</b> manual pages, <b>22</b> basic categories and a bunch of general terminal tips. It works 100% offline, doesn't need an internet connection and has no tracking software.
 
 <b>Categories</b>
 
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
@@ -1 +1 @@
-6724 manual pages, 22 basic categories and a bunch of general terminal tips.
+6766 manual pages, 22 basic categories and a bunch of general terminal tips.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,20 +1,22 @@
 [versions]
-kotlin = "2.1.20"
+appVersion = "3.3.10"
+androidVersionCode = "104"
+kotlin = "2.1.21"
+kotlinGradlePlugin = "2.1.21"
 accompanistAppcompatTheme = "0.36.0"
 activityCompose = "1.10.1"
 foundation = "1.8.1"
 gradle = "8.10.0"
-json = "20250107"
+json = "20250517"
 koinCore = "4.0.4"
-kotlinGradlePlugin = "2.1.20"
 kotlinxCoroutinesCore = "1.10.2"
 kotlinxHtmlJvm = "0.12.0"
 lifecycleViewmodelCompose = "2.9.0"
 material = "1.8.1"
 materialIcons = "1.7.8"
 navigationCompose = "2.9.0"
 preference = "1.2.1"
-sqldelight = "2.0.2"
+sqldelight = "2.1.0"
 uiToolingPreview = "1.8.1"
 spotless = "7.0.3"
 

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@ import androidx.compose.ui.res.stringResource`
`30`	`30`	`import androidx.compose.ui.tooling.preview.Preview`
`31`	`31`	`import androidx.compose.ui.unit.dp`
`32`	`32`	`import androidx.compose.ui.window.Dialog`
`33`		`-import com.inspiredandroid.linuxcommandbibliotheca.BuildConfig`
`34`	`33`	`import com.inspiredandroid.linuxcommandbibliotheca.R`
`35`	`34`	`import com.inspiredandroid.linuxcommandbibliotheca.ui.theme.LinuxTheme`
	`35`	`+import com.linuxcommandlibrary.shared.*`
`36`	`36`
`37`	`37`	`/* Copyright 2022 Simon Schubert`
`38`	`38`	`*`
`@@ -91,7 +91,7 @@ fun AppInfoDialog(`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`	`Text(`
`94`		`- "Version: ${BuildConfig.VERSION_NAME}",`
	`94`	`+ "Version: ${Version.appVersion}",`
`95`	`95`	`style = MaterialTheme.typography.caption,`
`96`	`96`	`modifier = Modifier.padding(8.dp),`
`97`	`97`	`)`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ buildscript {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`group = "com.inspiredandroid"`
`23`		`-version = "3.3.9"`
`24`	`23`
`25`	`24`	`allprojects {`
`26`	`25`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-The app currently has <b>6724</b> manual pages, <b>22</b> basic categories and a bunch of general terminal tips. It works 100% offline, doesn't need an internet connection and has no tracking software.`
	`1`	`+The app currently has <b>6766</b> manual pages, <b>22</b> basic categories and a bunch of general terminal tips. It works 100% offline, doesn't need an internet connection and has no tracking software.`
`2`	`2`
`3`	`3`	`<b>Categories</b>`
`4`	`4`