Preliminary support for tag suffixes

Instead of adding some more convoluted and additional code to Git
Version specifically to handle tags with suffixes, it instead now uses a
new approach when handling tag prefix.

tl;dr default filter `*-*` is now `[[:digit"]]**`.

Even since before Git Version, it was established through the use of
`Character#isDigit` that all tags should, in some way, include a valid
number to convey the version. Prior to Git Version 0.4, when checking
for tags without a tag prefix, the filter would simply check if the tag
didn't have any dashes in it. Since the tag prefix should only ever
remain a prefix, I've simplified this to instead check for a digit.
JGit's glob filtering uses the same digit detection as
`Character#isDigit`.

Now, tag prefixes prepend the default filter with `TAG_PREFIX[-v]*`.
This makes the filterer search for the defined tag prefix while
optionally accounting for any extra dashes or v's (for legacy branches
that use `v1.0` or something). So, the contract is now that a tag must
always include a digit for it to be included in versioning.

Author: Jonathing

src/main/java/net/minecraftforge/gitver/internal/GitVersionImpl.java

@@ -26,6 +26,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 public sealed class GitVersionImpl implements GitVersion permits GitVersionImpl.Empty {
     // Git
@@ -130,10 +131,7 @@ private Info calculateInfo(CommitCountProvider commitCountProvider) {
                 it.setLong(true);
 
                 try {
-                    if (!this.tagPrefix.isEmpty())
-                        it.setMatch(this.tagPrefix + "**");
-                    else
-                        it.setExclude("*-*");
+                    it.setMatch("%s[[:digit:]]**".formatted(!this.tagPrefix.isEmpty() ? this.tagPrefix + "[-v]*" : ""));
 
                     for (String filter : this.filters) {
                         if (filter.startsWith("!"))
@@ -147,7 +145,7 @@ private Info calculateInfo(CommitCountProvider commitCountProvider) {
             }).call();
 
             if (describedTag == null)
-                throw new RefNotFoundException("Tag not found! Tag prefix: %s, Filters: %s".formatted(this.tagPrefix, String.join(", ", this.filters)));
+                throw new RefNotFoundException("Tag not found! A valid tag must include a digit at the minimum! Tag prefix: %s, Filters: %s".formatted(this.tagPrefix, String.join(", ", this.filters)));
 
             var desc = Util.rsplit(describedTag, "-", 2);
 
@@ -159,22 +157,16 @@ private Info calculateInfo(CommitCountProvider commitCountProvider) {
                 return target != null ? target.getName() : null;
             }); // matches Repository.getFullBranch() but returning null when on a detached HEAD
 
-            var ret = Info.builder();
-            ret.tag = Util.make(() -> {
-                var t = desc[0].substring(this.tagPrefix.length());
-                return t
-                    .substring(t.startsWith("-v") && t.length() > 2 ? 2 : 0)
-                    .substring((t.indexOf('v') == 0 || t.indexOf('-') == 0) && t.length() > 1 && Character.isDigit(t.charAt(1)) ? 1 : 0);
-            });
-
-            ret.offset = commitCountProvider.getAsString(this.git, desc[0], desc[1], this.strict);
-            ret.hash = desc[2];
-            if (longBranch != null) ret.branch = Repository.shortenRefName(longBranch);
-            ret.commit = ObjectId.toString(head.getObjectId());
-            ret.abbreviatedId = head.getObjectId().abbreviate(8).name();
-            ret.url = GitUtils.buildProjectUrl(this.git);
-
-            return ret.build();
+            var tag = desc[0].substring(Util.indexOf(desc[0], Character::isDigit, 0));
+
+            var offset = commitCountProvider.getAsString(this.git, desc[0], desc[1], this.strict);
+            var hash = desc[2];
+            var branch = longBranch != null ? Repository.shortenRefName(longBranch) : null;
+            var commit = ObjectId.toString(head.getObjectId());
+            var abbreviatedId = head.getObjectId().abbreviate(8).name();
+            var url = GitUtils.buildProjectUrl(this.git);
+
+            return new Info(tag, offset, hash, branch, commit, abbreviatedId, url);
         } catch (Exception e) {
             if (this.strict) throw new GitVersionExceptionInternal("Failed to calculate version info", e);
 
@@ -204,24 +196,6 @@ public record Info(
         @Deprecated(forRemoval = true, since = "0.2") @Nullable String getUrl
     ) implements GitVersion.Info {
         private static final Info EMPTY = new Info("0.0", "0", "00000000", "master", "0000000000000000000000", "00000000", null);
-
-        private static Builder builder() {
-            return new Builder();
-        }
-
-        private static final class Builder {
-            private String tag;
-            private String offset;
-            private String hash;
-            private String branch;
-            private String commit;
-            private String abbreviatedId;
-            @Deprecated(forRemoval = true, since = "0.2") private String url;
-
-            private Info build() {
-                return new Info(this.tag, this.offset, this.hash, this.branch, this.commit, this.abbreviatedId, this.url);
-            }
-        }
     }
 
 
@@ -297,13 +271,12 @@ private List<File> calculateSubprojects(Collection<GitVersionConfig.Project> pro
         return Collections.unmodifiableList(ret);
     }
 
-
     /** The default implementation of {@link CommitCountProvider}, ignoring subprojects */
     private int getSubprojectCommitCount(Git git, String tag) {
         var excludePaths = this.getSubprojectPaths();
         if (this.localPath.isEmpty() && excludePaths.isEmpty()) return -1;
 
-        var includePaths = !this.localPath.isEmpty() ? Collections.singleton(this.localPath) : Collections.<String>emptySet();
+        var includePaths = !this.localPath.isEmpty() ? Collections.singleton(this.localPath) : Set.<String>of();
         try {
             int count = GitUtils.countCommits(git, tag, this.tagPrefix, includePaths, excludePaths);
             return Math.max(count, 0);

src/main/java/net/minecraftforge/gitver/internal/Util.java

@@ -4,7 +4,6 @@
  */
 package net.minecraftforge.gitver.internal;
 
-import org.eclipse.jgit.util.StringUtils;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -86,6 +85,16 @@ static int count(Iterable<?> iterable) {
         return null;
     }
 
+    @FunctionalInterface
+    interface CharPredicate { boolean test(char c); }
+    static int indexOf(String s, CharPredicate matcher, int orElse) {
+        for (var c : s.toCharArray()) {
+            if (matcher.test(c)) return s.indexOf(c);
+        }
+
+        return orElse;
+    }
+
     /**
      * Finds the first element in an iterable that matches the given predicate.
      *