Merge branch 'main' into use-semver-compare

Author: SethTisue

.java-version

@@ -72,7 +72,7 @@ You can begin to use git to control your project versions.
 The git plugin will now autogenerate your version using the following rules, in order:
 
 1. Looks at version-property setting (default to `project.version`), and checks the `sys.props` to see if this has a value.  If so, use it.
-2. Otherwise, looks at the project tags. The first to match the `gitTagToVersionNumberSetting` is used to assign the version.  The default is to look for tags that begin with `v` and a number, and use the number as the version. If there are multiple version tags, it will pick the highest.
+2. Otherwise, looks at the project tags. The first to match the `gitTagToVersionNumber` setting is used to assign the version.  The default is to look for tags that begin with `v` and a number, and use the number as the version. If there are multiple version tags, it will pick the highest.
 3. If no tags are found either, look at the head commit. We attach this to the `git.baseVersion` setting: "<base-version>.<git commit sha>"
 4. If no head commit is present either (which means this is a brand-new repository with no commits yet), we append the current timestamp to the base version: "<base-version>.<timestamp>".
 

README.md

@@ -14,9 +14,9 @@ enablePlugins(GitVersioning, SbtPlugin)
 git.baseVersion := "1.0"
 
 libraryDependencies ++= Seq(
-  "org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.1.202206130422-r",
+  "org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.3.202401111512-r",
   "com.github.zafarkhaja" % "java-semver" % "0.10.2",
-  "org.scalameta" %% "munit" % "0.7.29" % Test
+  "org.scalameta" %% "munit" % "1.0.1" % Test,
 )
 
 scriptedLaunchOpts += s"-Dproject.version=${version.value}"

build.sbt

@@ -1 +1 @@
-sbt.version=1.7.0
+sbt.version=1.10.0

project/build.properties

@@ -1,3 +1,3 @@
 libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
 
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1")

project/plugins.sbt

@@ -15,6 +15,11 @@ class ConsoleGitReadableOnly(git: GitRunner, cwd: File, log: Logger) extends Git
 
   def describedVersion: Option[String] = Try(git("describe", "--tags")(cwd, log).split("\\s+").headOption).toOption.flatten
 
+  override def describedVersion(patterns: Seq[String]): Option[String] =
+    patterns.headOption.fold(describedVersion)(pat =>
+      Try(git("describe", "--tags", "--match", pat)(cwd, log).split("\\s+").headOption).toOption.flatten
+    )
+
   def hasUncommittedChanges: Boolean = Try(!git("status", "-s")(cwd, log).trim.isEmpty).getOrElse(true)
 
   def branches: Seq[String] = Try(git("branch", "--list")(cwd, log).split("\\s+").toSeq).getOrElse(Seq())

src/main/scala/com/github/sbt/git/ConsoleGitReadableOnly.scala

@@ -176,7 +176,7 @@ object SbtGit {
    * Versioning runs through the following:
    *
    * 1. Looks at version-property settings, and checks the sys.props to see if this has a value.
-   * 2. Looks at the project tags.  The first to match the `gitTagToVersionNumberSetting` is used to assign the version.
+   * 2. Looks at the project tags.  The first to match the `gitTagToVersionNumber` setting is used to assign the version.
    * 3. if we have a head commit, we attach this to the base version setting "<base-version>.<git commit sha>"
    * 4. We append the current timestamp to the base version: "<base-version>.<timestamp>"
    */