diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a30e0a9..7cbca30 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -18,13 +18,13 @@ fun safeGitOutput(vararg args: String): String? { .getOrNull() } -val versionBase = providers.gradleProperty("ROSETTA_VERSION_BASE").orElse("1.0") -val explicitVersionCode = providers.gradleProperty("ROSETTA_VERSION_CODE").orNull?.toIntOrNull() -val explicitVersionName = providers.gradleProperty("ROSETTA_VERSION_NAME").orNull -val gitCommitCount = safeGitOutput("rev-list", "--count", "HEAD")?.toIntOrNull() val gitShortSha = safeGitOutput("rev-parse", "--short", "HEAD") ?: "unknown" -val computedVersionCode = (explicitVersionCode ?: gitCommitCount ?: 1).coerceAtLeast(1) -val computedVersionName = explicitVersionName ?: "${versionBase.get()}.$computedVersionCode" + +// ═══════════════════════════════════════════════════════════ +// Rosetta versioning — bump here on each release +// ═══════════════════════════════════════════════════════════ +val rosettaVersionName = "1.0.1" +val rosettaVersionCode = 2 // Increment on each release android { namespace = "com.rosetta.messenger" @@ -34,8 +34,8 @@ android { applicationId = "com.rosetta.messenger" minSdk = 24 targetSdk = 34 - versionCode = computedVersionCode - versionName = computedVersionName + versionCode = rosettaVersionCode + versionName = rosettaVersionName buildConfigField("String", "GIT_SHA", "\"$gitShortSha\"") testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/rosetta/messenger/ui/chats/ChatsListScreen.kt b/app/src/main/java/com/rosetta/messenger/ui/chats/ChatsListScreen.kt index 4c88d7d..adc94aa 100644 --- a/app/src/main/java/com/rosetta/messenger/ui/chats/ChatsListScreen.kt +++ b/app/src/main/java/com/rosetta/messenger/ui/chats/ChatsListScreen.kt @@ -39,6 +39,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.airbnb.lottie.compose.* import com.rosetta.messenger.R +import com.rosetta.messenger.BuildConfig import com.rosetta.messenger.data.AccountManager import com.rosetta.messenger.data.EncryptedAccount import com.rosetta.messenger.data.RecentSearchesManager @@ -904,7 +905,7 @@ fun ChatsListScreen( Alignment.CenterStart ) { Text( - text = "Rosetta v1.0.0", + text = "Rosetta v${BuildConfig.VERSION_NAME}", fontSize = 12.sp, color = if (isDarkTheme)