From 4dd6369e1afcd84180bfe12ac204c9ad224ec0ec Mon Sep 17 00:00:00 2001 From: Nullptr <52071314+Dr-TSNG@users.noreply.github.com> Date: Fri, 4 Mar 2022 13:29:46 +0800 Subject: [PATCH] Use git commit count as verCode --- apkzlib/build.gradle.kts | 2 +- app/build.gradle.kts | 2 +- build.gradle.kts | 10 ++++++++-- patch/build.gradle.kts | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/apkzlib/build.gradle.kts b/apkzlib/build.gradle.kts index 96e7e0a..64e4e58 100644 --- a/apkzlib/build.gradle.kts +++ b/apkzlib/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { implementation("org.bouncycastle:bcpkix-jdk15on:1.70") implementation("org.bouncycastle:bcprov-jdk15on:1.70") api("com.google.guava:guava:31.0.1-jre") - api("com.android.tools.build:apksig:7.1.1") + api("com.android.tools.build:apksig:7.1.2") compileOnlyApi("com.google.auto.value:auto-value-annotations:1.9") annotationProcessor("com.google.auto.value:auto-value:1.9") } diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c850bce..55e4c53 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -96,5 +96,5 @@ dependencies { implementation(projects.share) implementation(projects.imanager) - implementation("com.google.code.gson:gson:2.8.9") + implementation("com.google.code.gson:gson:2.9.0") } diff --git a/build.gradle.kts b/build.gradle.kts index ce462f2..0401669 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,5 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. +import org.eclipse.jgit.api.Git +import org.eclipse.jgit.internal.storage.file.FileRepository buildscript { repositories { @@ -8,14 +9,19 @@ buildscript { val agpVersion by extra("7.1.2") dependencies { classpath("com.android.tools.build:gradle:$agpVersion") + classpath("org.eclipse.jgit:org.eclipse.jgit:6.0.0.202111291000-r") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10") } } +val repo = FileRepository(rootProject.file(".git")) +val refId = repo.refDatabase.exactRef("refs/remotes/origin/lsp").objectId!! +val commitCount = Git(repo).log().add(refId).call().count() + // sync from https://github.com/LSPosed/LSPosed/blob/master/build.gradle.kts val defaultManagerPackageName by extra("org.lsposed.lspatch") val apiCode by extra(93) -val verCode by extra(1) +val verCode by extra(commitCount) val verName by extra("0.3") val androidMinSdkVersion by extra(28) val androidTargetSdkVersion by extra(32) diff --git a/patch/build.gradle.kts b/patch/build.gradle.kts index 95ef9f9..b99a803 100644 --- a/patch/build.gradle.kts +++ b/patch/build.gradle.kts @@ -18,5 +18,5 @@ dependencies { implementation("commons-io:commons-io:2.11.0") implementation("com.beust:jcommander:1.82") - implementation("com.google.code.gson:gson:2.8.9") + implementation("com.google.code.gson:gson:2.9.0") }