Added commit hash to version strings

This commit is contained in:
snake-4
2024-03-26 19:49:18 +01:00
parent b63132e9f8
commit b3d8493612
3 changed files with 12 additions and 4 deletions

View File

@@ -4,6 +4,15 @@ plugins {
alias(libs.plugins.agp.lib) apply false alias(libs.plugins.agp.lib) apply false
} }
val commitHash: String by extra({
val stdout = ByteArrayOutputStream()
rootProject.exec {
commandLine("git", "rev-parse", "--short", "HEAD")
standardOutput = stdout
}
stdout.toString().trim()
})
val moduleId by extra("zygisk-assistant") val moduleId by extra("zygisk-assistant")
val moduleName by extra("Zygisk Assistant") val moduleName by extra("Zygisk Assistant")
val verName by extra("v2.0.0") val verName by extra("v2.0.0")

View File

@@ -7,6 +7,7 @@ plugins {
val moduleId: String by rootProject.extra val moduleId: String by rootProject.extra
val moduleName: String by rootProject.extra val moduleName: String by rootProject.extra
val verCode: Int by rootProject.extra val verCode: Int by rootProject.extra
val commitHash: String by rootProject.extra
val verName: String by rootProject.extra val verName: String by rootProject.extra
val abiList: List<String> by rootProject.extra val abiList: List<String> by rootProject.extra
@@ -39,7 +40,7 @@ androidComponents.onVariants { variant ->
val libOutDir = layout.buildDirectory.dir("intermediates/stripped_native_libs/$variantLowered/out/lib").get() val libOutDir = layout.buildDirectory.dir("intermediates/stripped_native_libs/$variantLowered/out/lib").get()
val moduleDir = layout.buildDirectory.dir("outputs/module/$variantLowered").get() val moduleDir = layout.buildDirectory.dir("outputs/module/$variantLowered").get()
val zipOutDir = layout.buildDirectory.dir("outputs/release").get() val zipOutDir = layout.buildDirectory.dir("outputs/release").get()
val zipFileName = "$moduleName-$verName-$verCode-$buildTypeLowered.zip".replace(' ', '-') val zipFileName = "$moduleName-$verName-$commitHash-$buildTypeLowered.zip".replace(' ', '-')
val prepareModuleFilesTask = task<Sync>("prepareModuleFiles$variantCapped") { val prepareModuleFilesTask = task<Sync>("prepareModuleFiles$variantCapped") {
group = "module" group = "module"
@@ -50,7 +51,7 @@ androidComponents.onVariants { variant ->
expand( expand(
"moduleId" to moduleId, "moduleId" to moduleId,
"moduleName" to moduleName, "moduleName" to moduleName,
"versionName" to "$verName ($verCode-$variantLowered)", "versionName" to "$verName ($commitHash-$variantLowered)",
"versionCode" to verCode "versionCode" to verCode
) )
} }

View File

@@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest/>