moving the assemble dependsOn to the createJarTask method to eliminat…

…e an unnecessary null check
accolasia · Jun 20, 2014 · 6bc28e3 · 6bc28e3
1 parent 26bc995
commit 6bc28e3
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/src/main/groovy/com/bancvue/gradle/maven/publish/ExtendedPublication.groovy b/src/main/groovy/com/bancvue/gradle/maven/publish/ExtendedPublication.groovy
@@ -88,20 +88,12 @@ class ExtendedPublication {
 	private void setJarTaskIfNotSet() {
 		if (archiveTask == null) {
 			archiveTask = findOrCreateJarTask()
-			assembleDependsOnArchiveTaskIfNotNull(archiveTask)
-		}
-	}
-
-	private void assembleDependsOnArchiveTaskIfNotNull(Jar archiveTask) {
-		if (archiveTask != null) {
-			project.getTasks().getByName(BasePlugin.ASSEMBLE_TASK_NAME).dependsOn(archiveTask);
 		}
 	}
 
 	private void setSourceJarTaskIfNotSet() {
 		if (sourcesArchiveTask == null) {
 			sourcesArchiveTask = findOrCreateSourcesJarTask()
-			assembleDependsOnArchiveTaskIfNotNull(sourcesArchiveTask)
 		}
 	}
 
@@ -158,6 +150,7 @@ class ExtendedPublication {
 			}
 			from isSourceJar ? getSourceSet().allSource : getSourceSet().output
 		}
+		project.getTasks().getByName(BasePlugin.ASSEMBLE_TASK_NAME).dependsOn(jarTask)
 		jarTask
 	}