Skip to content

Commit 90323f8

Browse files
committed
feat: Add commit hash to build config and use it for cache
1 parent 339e2fa commit 90323f8

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

.github/workflows/android.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ jobs:
2424
- name: Grant execute permission for gradlew
2525
run: chmod +x gradlew
2626

27+
- name: Write key
28+
run: |
29+
echo KEYSTORE_PASSWORD=${{ secrets.KEYSTORE_PASSWORD }} > signing.properties
30+
echo KEYSTORE_ALIAS=${{ secrets.KEYSTORE_ALIAS }} >> signing.properties
31+
echo KEYSTORE_ALIAS_PASSWORD='${{ secrets.KEYSTORE_ALIAS_PASSWORD }}' >> signing.properties
32+
echo KEYSTORE_FILE=../key.jks >> signing.properties
33+
echo ${{ secrets.KEYSTORE }} | base64 --decode > key.jks
34+
2735
- name: Build Debug
2836
run: ./gradlew assembleUniversalDebug
2937

app/build.gradle.kts

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ plugins {
1111
alias(libs.plugins.jetbrains.kotlin.android)
1212
}
1313

14+
val gitCommitHashProvider = providers.exec {
15+
commandLine("git", "rev-parse", "--short", "HEAD")
16+
workingDir = rootProject.rootDir
17+
}.standardOutput.asText!!
18+
1419
android {
1520
namespace = "io.github.chsbuffer.revancedxposed"
1621

@@ -22,21 +27,10 @@ android {
2227
rootProject.file("revanced-patches/gradle.properties").inputStream().use { load(it) }
2328
}["version"]
2429
buildConfigField("String", "PATCH_VERSION", "\"$patchVersion\"")
30+
buildConfigField("String", "COMMIT_HASH", "\"${gitCommitHashProvider.get().trim()}\"")
2531
}
2632
flavorDimensions += "abi"
2733
productFlavors {
28-
create("x86_64") {
29-
dimension = "abi"
30-
ndk {
31-
abiFilters.add("x86_64")
32-
}
33-
}
34-
create("arm64_v8a") {
35-
dimension = "abi"
36-
ndk {
37-
abiFilters.add("arm64-v8a")
38-
}
39-
}
4034
create("universal") {
4135
dimension = "abi"
4236
}

app/src/main/java/io/github/chsbuffer/revancedxposed/BaseHook.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ abstract class BaseHook(val app: Application, val lpparam: LoadPackageParam) : I
125125
private val failedHooks = mutableListOf<HookFunction>()
126126

127127
// cache
128-
private val moduleRel = BuildConfig.VERSION_CODE
128+
private val moduleRel = BuildConfig.COMMIT_HASH
129129
private var cache = PrefCache(app)
130130
private var dexkit = run {
131131
System.loadLibrary("dexkit")

0 commit comments

Comments
 (0)