diff --git a/app-unpriv/build.gradle.kts b/app-unpriv/build.gradle.kts index 66a60b4..d59fe71 100644 --- a/app-unpriv/build.gradle.kts +++ b/app-unpriv/build.gradle.kts @@ -27,6 +27,9 @@ android { } buildTypes { + defaultConfig { + versionNameSuffix = "-unpriv" + } release { isMinifyEnabled = false proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b9c2100..69e0db5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -23,6 +23,9 @@ android { } buildTypes { + defaultConfig { + versionNameSuffix = "-priv" + } release { isMinifyEnabled = false proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") diff --git a/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt b/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt index 24f0235..ef07c43 100644 --- a/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt +++ b/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt @@ -16,7 +16,7 @@ val Project.gitVersionCode: Int standardOutput = stdout } stdout.toString("utf-8").trim('\n').toInt() - } catch (e: Exception) { + } catch (_: Exception) { 0 } @@ -29,7 +29,7 @@ val Project.gitVersionName: String standardOutput = stdout } stdout.toString("utf-8").trim('\n') - } catch (e: Exception) { + } catch (_: Exception) { "Unknown" } @@ -38,7 +38,7 @@ class MyVersioningPlugin: Plugin { target.configure { defaultConfig { versionCode = target.gitVersionCode - versionName = target.gitVersionName + versionName = target.gitVersionName.removePrefix("unpriv-") } applicationVariants.all {