fix: automatically add tasks that produce releaseAssets as dependencies

refs #13
tschulte · Aug 11, 2016 · 93d21f6 · 93d21f6
1 parent 52a5e01
commit 93d21f6
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/src/main/groovy/de/gliderpilot/gradle/semanticrelease/SemanticReleasePluginExtension.groovy b/src/main/groovy/de/gliderpilot/gradle/semanticrelease/SemanticReleasePluginExtension.groovy
@@ -39,7 +39,12 @@ class SemanticReleasePluginExtension {
     @Inject
     SemanticReleasePluginExtension(Project project) {
         this.project = project
-        changeLog = new SemanticReleaseChangeLogService(project.grgit, project.release.tagStrategy, project.&files)
+        def files = { Object[] args ->
+            if (args)
+                project.tasks.release.dependsOn args
+            project.files(args)
+        }
+        changeLog = new SemanticReleaseChangeLogService(project.grgit, project.release.tagStrategy, files)
         releaseBranches = new SemanticReleaseCheckBranch()
         branchNames = new SemanticReleaseAppendBranchNameStrategy(releaseBranches)
         semanticStrategy = new SemanticReleaseNormalStrategy(project.grgit, changeLog)

diff --git a/src/test/groovy/de/gliderpilot/gradle/semanticrelease/SemanticReleasePluginSpec.groovy b/src/test/groovy/de/gliderpilot/gradle/semanticrelease/SemanticReleasePluginSpec.groovy
@@ -16,6 +16,7 @@
 package de.gliderpilot.gradle.semanticrelease
 
 import nebula.test.ProjectSpec
+import org.gradle.api.tasks.bundling.Jar
 
 /**
  * Created by tobias on 7/2/15.
@@ -167,18 +168,36 @@ class SemanticReleasePluginSpec extends ProjectSpec {
     }
 
     def "can define releaseAssets"() {
-        when:
+        given:
         project.with {
             apply plugin: PLUGIN
             apply plugin: 'java'
+            tasks.create(name: "sourcesJar", type: Jar) {
+                classifier = 'sources'
+                from sourceSets.main.allSource
+            }
+            tasks.create(name: "javadocJar", type: Jar) {
+                classifier = 'javadoc'
+                from javadoc
+            }
             semanticRelease {
                 changeLog {
-                    releaseAssets jar
+                    releaseAssets jar, sourcesJar, javadocJar
                 }
             }
         }
 
+        when:
+        List<File> releaseAssets = project.semanticRelease.changeLog.releaseAssets.toList()
+
         then:
-        project.semanticRelease.changeLog.releaseAssets.toList().containsAll(project.jar.outputs.files.files)
+        releaseAssets.containsAll(project.jar.outputs.files.files)
+        releaseAssets.containsAll(project.sourcesJar.outputs.files.files)
+        releaseAssets.containsAll(project.javadocJar.outputs.files.files)
+
+        and: "task dependencies are automatically added"
+        project.tasks.release.dependsOn.contains(project.jar)
+        project.tasks.release.dependsOn.contains(project.sourcesJar)
+        project.tasks.release.dependsOn.contains(project.javadocJar)
     }
 }