Merge pull request #2 from zombiedev/project-dir

use project dir in getGitVersion
Nasdaq · Mar 7, 2016 · d79a292 · d79a292
2 parents abb0bd6 + 98f7bb6
commit d79a292
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/groovy/com/cinnober/gradle/semver_git/SemverGitPlugin.groovy b/src/main/groovy/com/cinnober/gradle/semver_git/SemverGitPlugin.groovy
@@ -29,13 +29,13 @@ import org.gradle.api.Plugin
 
 class SemverGitPlugin implements Plugin<Project> {
 
-    def static String getGitVersion(String nextVersion, String snapshotSuffix) {
-        def proc = "git describe --exact-match".execute();
+    def static String getGitVersion(String nextVersion, String snapshotSuffix, File projectDir = null) {
+        def proc = "git describe --exact-match".execute(null, projectDir);
         proc.waitFor();
         if (proc.exitValue() == 0) {
             return checkVersion(proc.text.trim());
         }
-        proc = "git describe".execute();
+        proc = "git describe".execute(null, projectDir);
         proc.waitFor();
         if (proc.exitValue() == 0) {
             def describe = proc.text.trim()
@@ -111,7 +111,7 @@ class SemverGitPlugin implements Plugin<Project> {
         if (project.ext.properties.containsKey("snapshotSuffix")) {
             snapshotSuffix = project.ext.snapshotSuffix
         }
-        project.version = getGitVersion(nextVersion, snapshotSuffix)
+        project.version = getGitVersion(nextVersion, snapshotSuffix, project.projectDir)
         project.task('showVersion') {
             group = 'Help'
             description = 'Show the project version'