From 01c197379ae6d6aa32b8cad1b32d2d96fb938906 Mon Sep 17 00:00:00 2001 From: Eugene Date: Sun, 9 Aug 2026 12:13:05 +0300 Subject: [PATCH] update version. use dynamic versionCode generation --- apps/vbox/client/androidApp/build.gradle.kts | 8 ++++++-- .../src/main/kotlin/ru/shadowsparky/AndroidExt.kt | 9 +++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/apps/vbox/client/androidApp/build.gradle.kts b/apps/vbox/client/androidApp/build.gradle.kts index d2b0fbc..5dd3dd9 100644 --- a/apps/vbox/client/androidApp/build.gradle.kts +++ b/apps/vbox/client/androidApp/build.gradle.kts @@ -1,3 +1,5 @@ +import ru.shadowsparky.generateVersionCode + plugins { alias(libs.plugins.convention.android.app) alias(libs.plugins.convention.compose) @@ -5,6 +7,8 @@ plugins { alias(libs.plugins.convention.ktor.client) } +val appVersion = "1.25.2" + android { buildFeatures { buildConfig = true } namespace = "ru.shadowsparky.videobox.multiplatform" @@ -12,8 +16,8 @@ android { applicationId = namespace minSdk = libs.versions.proj.min.get().toInt() targetSdk = libs.versions.proj.target.get().toInt() - versionCode = 50 - versionName = "1.25.1" + versionCode = generateVersionCode(appVersion) + versionName = appVersion } } diff --git a/build-logic/convention/src/main/kotlin/ru/shadowsparky/AndroidExt.kt b/build-logic/convention/src/main/kotlin/ru/shadowsparky/AndroidExt.kt index 248ae78..5e6eeb3 100644 --- a/build-logic/convention/src/main/kotlin/ru/shadowsparky/AndroidExt.kt +++ b/build-logic/convention/src/main/kotlin/ru/shadowsparky/AndroidExt.kt @@ -37,3 +37,12 @@ fun ApplicationExtension.setupAndroid(project: Project) { targetCompatibility = javaVersion } } + +fun generateVersionCode(versionName: String): Int { + val parts = versionName.split(".") + val major = parts.getOrNull(0)?.toIntOrNull() ?: 0 + val minor = parts.getOrNull(1)?.toIntOrNull() ?: 0 + val patch = parts.getOrNull(2)?.toIntOrNull() ?: 0 + if (minor > 999 || patch > 999) error("invalid minor or patch!") + return major * 1_000_000 + minor * 1_000 + patch +}