Fixed #103

Made the input directory more correct. This fixes the Gradle warnings. Inspired on the PR #145
shipkit · Jan 24, 2024 · 6b10cbb · 6b10cbb
1 parent c6b8eaf
commit 6b10cbb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/main/java/org/shipkit/changelog/GenerateChangelogTask.java b/src/main/java/org/shipkit/changelog/GenerateChangelogTask.java
@@ -139,11 +139,22 @@ public void setOutputFile(File outputFile) {
         this.outputFile = outputFile;
     }
 
-    @InputDirectory
+    @Internal
     public File getWorkingDir() {
         return workingDir;
     }
 
+    @InputDirectory
+    @PathSensitive(PathSensitivity.RELATIVE)
+    public File getGitDir() {
+        if (workingDir == null) {
+            return null;
+        }
+        else {
+            return new File(workingDir, ".git");
+        }
+    }
+
     public void setWorkingDir(File workingDir) {
         this.workingDir = workingDir;
     }

diff --git a/src/test/groovy/org/shipkit/changelog/ChangelogPluginTest.groovy b/src/test/groovy/org/shipkit/changelog/ChangelogPluginTest.groovy
@@ -12,6 +12,13 @@ class ChangelogPluginTest extends Specification {
         project.plugins.apply(ChangelogPlugin)
 
         then:
-        project.tasks.generateChangelog
+        GenerateChangelogTask t = project.tasks.generateChangelog
+        t.gitDir
+
+        when:
+        t.workingDir = null
+
+        then:
+        !t.gitDir
     }
 }