Set abbreviation length of hashes to a fixed 7, since the length is d…

…ynamic in som git versions.
Nasdaq · Jan 16, 2018 · f5a146b · f5a146b
1 parent b97ed88
commit f5a146b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -1,3 +1,4 @@
 Mikael Brännström
 Anders Lindgren
+Morgan Johansson
 
diff --git a/build.gradle b/build.gradle
@@ -121,7 +121,16 @@ task (fixPublishPlugins) {
   // Gradle Plugin Portal does not support signed artifacts, but Maven Central requires signed artifacts.
   // Remove signed artifacts if publishing to Gradle Plugin Portal
   doFirst {
-    configurations.archives.artifacts.removeAll { it.extension == "asc" }
+    configurations.archives.artifacts.with { archives ->
+      def jarArtifact
+        archives.each {
+          if (it.extension == 'asc') {
+            jarArtifact = it
+          }
+        }
+      remove(jarArtifact)
+    }
   }
 }
 publishPlugins.dependsOn fixPublishPlugins
+
diff --git a/src/main/groovy/com/cinnober/gradle/semver_git/SemverGitPlugin.groovy b/src/main/groovy/com/cinnober/gradle/semver_git/SemverGitPlugin.groovy
@@ -35,7 +35,7 @@ class SemverGitPlugin implements Plugin<Project> {
         if (proc.exitValue() == 0) {
             return checkVersion(proc.text.trim());
         }
-        proc =("git describe " + gitArgs).execute(null, projectDir);
+        proc =("git describe --abbrev=7 " + gitArgs).execute(null, projectDir);
         proc.waitFor();
         if (proc.exitValue() == 0) {
             def describe = proc.text.trim()