add version fallback to git version tagging

LCLPYT · Nov 11, 2023 · 29aaf85 · 29aaf85
1 parent b0e5ab5
commit 29aaf85
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/main/java/work/lclpnet/build/ext/BuildUtilsExtension.java b/src/main/java/work/lclpnet/build/ext/BuildUtilsExtension.java
@@ -14,6 +14,8 @@ public interface BuildUtilsExtension {
 
     Property<String> getVersionPattern();
 
+    Property<String> getFallbackVersion();
+
     /**
      * Loads properties from a source, such as a file or filename.
      * The properties are loaded into this extension.

diff --git a/src/main/java/work/lclpnet/build/ext/BuildUtilsExtensionImpl.java b/src/main/java/work/lclpnet/build/ext/BuildUtilsExtensionImpl.java
@@ -18,13 +18,15 @@ public class BuildUtilsExtensionImpl implements BuildUtilsExtension {
 
     private final Project project;
     private final Property<String> versionPattern;
+    private final Property<String> fallbackVersion;
     private final Properties properties = new Properties();
     private GitVersionResolver gitVersionResolver = null;
     private volatile String latestTag = null;
 
     public BuildUtilsExtensionImpl(Project project) {
         this.project = project;
         this.versionPattern = project.getObjects().property(String.class).convention(GitVersionResolver.VERSION_PATTERN);
+        this.fallbackVersion = project.getObjects().property(String.class).convention("0.1.0-SNAPSHOT");
     }
 
     @Override
@@ -101,6 +103,11 @@ public Property<String> getVersionPattern() {
         return versionPattern;
     }
 
+    @Override
+    public Property<String> getFallbackVersion() {
+        return fallbackVersion;
+    }
+
     private String fetchLatestTag() {
         if (latestTag != null) {
             return latestTag;
@@ -112,7 +119,7 @@ private String fetchLatestTag() {
             }
 
             if (gitVersionResolver == null) {
-                gitVersionResolver = new GitVersionResolver(project.getLogger());
+                gitVersionResolver = new GitVersionResolver(project.getLogger(), fallbackVersion.get());
             }
 
             File pwd = project.getProjectDir();

diff --git a/src/main/java/work/lclpnet/build/util/GitVersionResolver.java b/src/main/java/work/lclpnet/build/util/GitVersionResolver.java
@@ -9,9 +9,11 @@ public class GitVersionResolver {
 
     public static final String VERSION_PATTERN = "^[0-9]+\\.[0-9]+\\.[0-9]+(?:[-+][a-zA-Z0-9.]+)?$";
     private final Logger logger;
+    private final String fallbackVersion;
 
-    public GitVersionResolver(Logger logger) {
+    public GitVersionResolver(Logger logger, String fallbackVersion) {
         this.logger = logger;
+        this.fallbackVersion = fallbackVersion;
     }
 
     /**
@@ -42,7 +44,8 @@ public String getGitVersion(File pwd) {
 
             return result.stdout.trim().split("\\r?\\n")[0];
         } catch (Exception ex) {
-            throw new IllegalStateException("Could not determine version", ex);
+            logger.warn("Could not determine version from latest git tag. Fallback to {}", fallbackVersion, ex);
+            return fallbackVersion;
         }
     }
 }