From 65a276ff917fe2c4ab4be95d25ed9084e34f98c8 Mon Sep 17 00:00:00 2001 From: LoveSy Date: Tue, 29 Nov 2022 15:32:02 +0800 Subject: [PATCH] Use latest tag for publication --- .github/workflows/build.yml | 1 + lsplant/build.gradle.kts | 22 ++++++++++++++++++++-- lsplant/src/main/jni/include/lsplant.hpp | 2 +- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2c76116..30109e2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,6 +22,7 @@ jobs: uses: actions/checkout@v3 with: submodules: 'recursive' + fetch-depth: 0 - name: Set up JDK 17 uses: actions/setup-java@v3 with: diff --git a/lsplant/build.gradle.kts b/lsplant/build.gradle.kts index 7f5abb3..824de16 100644 --- a/lsplant/build.gradle.kts +++ b/lsplant/build.gradle.kts @@ -1,4 +1,6 @@ import java.nio.file.Paths +import org.eclipse.jgit.api.Git +import org.eclipse.jgit.storage.file.FileRepositoryBuilder plugins { id("com.android.library") @@ -6,6 +8,15 @@ plugins { id("signing") } +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath("org.eclipse.jgit:org.eclipse.jgit:6.3.0.202209071007-r") + } +} + val androidTargetSdkVersion: Int by rootProject.extra val androidMinSdkVersion: Int by rootProject.extra val androidBuildToolsVersion: String by rootProject.extra @@ -173,11 +184,18 @@ val symbolsStandaloneTask = tasks.register("generateStandaloneSymbolsJar") archiveClassifier.set("symbols") } +val ver = FileRepositoryBuilder().findGitDir(rootProject.file(".git")).runCatching { + build().use { + Git(it).describe().setTags(true).setAbbrev(0).call().removePrefix("v") + } +}.getOrNull() ?: "0.0" +println("${rootProject.name} version: $ver") + publishing { publications { fun MavenPublication.setup() { group = "org.lsposed.lsplant" - version = "5.2" + version = ver pom { name.set("LSPlant") description.set("A hook framework for Android Runtime (ART)") @@ -233,7 +251,7 @@ publishing { } } dependencies { - "standaloneCompileOnly"("dev.rikka.ndk.thirdparty:cxx:1.2.0") + "standaloneCompileOnly"("dev.rikka.ndk.thirdparty:cxx:1.2.0") } } diff --git a/lsplant/src/main/jni/include/lsplant.hpp b/lsplant/src/main/jni/include/lsplant.hpp index 23801f6..3ea2ca9 100644 --- a/lsplant/src/main/jni/include/lsplant.hpp +++ b/lsplant/src/main/jni/include/lsplant.hpp @@ -4,7 +4,7 @@ #include -/// \namespace namespace of LSPlant +/// \namespace lsplant namespace lsplant { inline namespace v2 {