Skip to content

Commit 2cd273f

Browse files
committed
chore: add override support to Packaging
Signed-off-by: Brandon McAnsh <git@bmcreations.dev>
1 parent 5349611 commit 2cd273f

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

apps/flipcash/app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ android {
2929
compileSdk = Android.compileSdkVersion
3030

3131
defaultConfig {
32-
versionCode = versioning.getVersionCode()
32+
versionCode = Packaging.Flipcash.versionCode ?: versioning.getVersionCode()
3333
versionName = Packaging.Flipcash.versionName
3434
applicationId = appNamespace
3535
minSdk = Android.minSdkVersion

apps/flipcash/app2/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ android {
2929
compileSdk = Android.compileSdkVersion
3030

3131
defaultConfig {
32-
versionCode = versioning.getVersionCode()
32+
versionCode = Packaging.Flipcash.versionCode ?: versioning.getVersionCode()
3333
versionName = Packaging.Flipcash.versionName
3434
applicationId = appNamespace
3535
minSdk = Android.minSdkVersion

buildSrc/src/main/java/Packaging.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,27 @@ sealed class Packaging(
33
minorVersion: String,
44
patchVersion: String,
55
suffix: String? = null,
6+
versionCodeOverride: Int? = null,
67
) {
78
constructor(
89
majorVersion: Int,
910
minorVersion: Int,
1011
patchVersion: Int,
1112
suffix: String? = null,
13+
versionCodeOverride: Int? = null,
1214
) : this(
1315
majorVersion = majorVersion.toString(),
1416
minorVersion = minorVersion.toString(),
1517
patchVersion = patchVersion.toString(),
1618
suffix = suffix,
19+
versionCodeOverride = versionCodeOverride,
1720
)
1821

1922
private val suffixString = suffix?.let { "-$it" } ?: ""
2023
val versionName = "$majorVersion.$minorVersion.$patchVersion$suffixString"
2124

25+
val versionCode: Int? = versionCodeOverride
26+
2227
object Code : Packaging(
2328
majorVersion = 2,
2429
minorVersion = 1,

0 commit comments

Comments
 (0)