feat: inherit version from parent project if not set

Author: qoomon

src/main/java/me/qoomon/gradle/gitversioning/GitVersioningPlugin.java

@@ -9,6 +9,7 @@
 
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
@@ -45,11 +46,14 @@ public void apply(@Nonnull Project rootProject) {
                             .map(it -> new VersionDescription(it.pattern, it.versionFormat, mapPropertyDescription(it.properties)))
                             .collect(toList()));
 
+
+            final Map<String, Object> originVersionMap = rootProject.getAllprojects().stream().collect(Collectors.toMap(Project::getPath, p -> p.getVersion()));
+
             rootProject.getAllprojects().forEach(project -> {
                 // TODO check for version is equals to root project
 
                 // update version
-                String gitProjectVersion = gitVersionDetails.getVersionTransformer().apply(project.getVersion().toString());
+                String gitProjectVersion = gitVersionDetails.getVersionTransformer().apply(resolveOriginVersion(project, originVersionMap));
 
                 project.getLogger().info(project.getDisplayName() + " - git versioning [" + project.getVersion() + " -> " + gitProjectVersion + "]"
                         + " (" + gitVersionDetails.getCommitRefType() + ":" + gitVersionDetails.getCommitRefName() + ")");
@@ -75,6 +79,21 @@ public void apply(@Nonnull Project rootProject) {
         });
     }
 
+    private String resolveOriginVersion(Project project, Map<String,Object> originVersionMap) {
+
+        String projectVersion = originVersionMap.get(project.getPath()).toString();
+        if (!projectVersion.equals("unspecified")) {
+            return projectVersion;
+        }
+
+        if(project.getParent() == null){
+            return "unspecified";
+        }
+
+        return resolveOriginVersion(project.getParent(), originVersionMap);
+
+    }
+
     private Map<String, String> getProjectStringProperties(Project project) {
         Map<String, String> result = new HashMap<>();
         for (Entry<String, ?> entry : project.getProperties().entrySet()) {

src/test/resources/testProjects/multiModuleProject/build.gradle

@@ -1,34 +1,29 @@
 plugins {
-    id 'me.qoomon.git-versioning' version '1.2.0'
+    id 'me.qoomon.git-versioning' version '1.2.2'
 }
 
 group = 'me.qoomon'
 version = '1.0.0-SNAPSHOT'
 
 gitVersioning {
 
-    commit {
-        versionFormat = 'headCommit-${commit.short}-vGIT'
-    }
-
     branch {
         pattern = 'master'
-        versionFormat = 'headBranch-${branch}-${version}-vGIT'
+        versionFormat = '${version}-xxx'
     }
-
     branch {
-        pattern = 'feature/(?<feature>.*)'
-        versionFormat = 'headBranch-feature-${feature}-vGIT'
+        pattern = 'feature/(?<user>.+)/(?<feature>.+)'
+        versionFormat = '${version}_${user}_${feature}'
     }
 
-    branch {
-        pattern = ".*"
-        versionFormat = 'headBranch-fallback-${branch}-vGIT'
-    }
 
-    tag {
-        pattern = 'v(?<release>[0-9]+)'
-        versionFormat = 'tag-version-${release}-vGIT'
+}
+
+allprojects {
+    task printVersion {
+        doLast {
+            println project.version
+        }
     }
 }