From fd1c51e027ae89fe3474bfde202fe14fafc95d81 Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Tue, 29 Nov 2022 22:05:22 +0800
Subject: [PATCH] Use latest tag for version name (#2251)

---
 .github/workflows/core.yml               |  5 +++--
 build.gradle.kts                         | 24 +++++++++++++++++-------
 external/dobby                           |  2 +-
 external/lsplant                         |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index 92c4621a..6a8233c5 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -4,6 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches: [ master ]
+    tags: [ v* ]
   pull_request:
 
 jobs:
@@ -21,7 +22,7 @@ jobs:
         submodules: 'recursive'
         fetch-depth: 0
     - name: Write key
-      if: github.event_name != 'pull_request' && github.ref == 'refs/heads/master'
+      if: ${{ ( github.event_name != 'pull_request' && github.ref == 'refs/heads/master' ) || github.ref_type == 'tag' }}
       run: |
         if [ ! -z "${{ secrets.KEY_STORE }}" ]; then
           echo androidStorePassword='${{ secrets.KEY_STORE_PASSWORD }}' >> gradle.properties
@@ -109,7 +110,7 @@ jobs:
           daemon/build/symbols
           dex2oat/build/symbols
     - name: Post to channel
-      if: ${{ github.event_name != 'pull_request' && success() && github.ref == 'refs/heads/master' }}
+      if: ${{ success() && ( ( github.event_name != 'pull_request' && github.ref == 'refs/heads/master' ) || github.ref_type == 'tag' ) }}
       env:
         CHANNEL_ID: ${{ secrets.CHANNEL_ID }}
         DISCUSSION_ID: ${{ secrets.DISCUSSION_ID }}
diff --git a/build.gradle.kts b/build.gradle.kts
index 100fd43c..7b24b9d6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -21,7 +21,7 @@ import com.android.build.api.dsl.ApplicationExtension
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import com.android.build.gradle.BaseExtension
 import org.eclipse.jgit.api.Git
-import org.eclipse.jgit.internal.storage.file.FileRepository
+import org.eclipse.jgit.storage.file.FileRepositoryBuilder
 import java.nio.file.Paths
 import org.gradle.internal.os.OperatingSystem
 
@@ -39,18 +39,28 @@ buildscript {
         classpath("org.eclipse.jgit:org.eclipse.jgit:6.3.0.202209071007-r")
     }
 }
-
-val repo = FileRepository(rootProject.file(".git"))
-val refId = repo.refDatabase.exactRef("refs/remotes/origin/master").objectId!!
-val commitCount = Git(repo).log().add(refId).call().count()
+val (commitCount, latestTag) = FileRepositoryBuilder().setGitDir(rootProject.file(".git"))
+    .runCatching {
+        build().use { repo ->
+            val git = Git(repo)
+            val commitCount =
+                git.log()
+                    .add(repo.refDatabase.exactRef("refs/remotes/origin/master").objectId)
+                    .call().count() + 4200
+            val ver = git.describe()
+                .setTags(true)
+                .setAbbrev(0).call().removePrefix("v")
+            commitCount to ver
+        }
+    }.getOrNull() ?: (1 to "1.0")
 
 val injectedPackageName by extra("com.android.shell")
 val injectedPackageUid by extra(2000)
 
 val defaultManagerPackageName by extra("org.lsposed.manager")
 val apiCode by extra(93)
-val verCode by extra(commitCount + 4200)
-val verName by extra("1.8.5")
+val verCode by extra(commitCount)
+val verName by extra(latestTag)
 val androidTargetSdkVersion by extra(33)
 val androidMinSdkVersion by extra(27)
 val androidBuildToolsVersion by extra("33.0.1")
diff --git a/external/dobby b/external/dobby
index a79d029b..f652f0c2 160000
--- a/external/dobby
+++ b/external/dobby
@@ -1 +1 @@
-Subproject commit a79d029bb2fd84a64a3fce87b813c222958725b7
+Subproject commit f652f0c2a181c27808b6170acabe99af0e4291b1
diff --git a/external/lsplant b/external/lsplant
index a15d8549..65a276ff 160000
--- a/external/lsplant
+++ b/external/lsplant
@@ -1 +1 @@
-Subproject commit a15d854930c46e4da35832c2140a5abbc794d405
+Subproject commit 65a276ff917fe2c4ab4be95d25ed9084e34f98c8
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ae04661e..070cb702 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists