From 2e9462b81f40090240fc1e7f5d36bbc84a48d43d Mon Sep 17 00:00:00 2001
From: ghidra4 <48601690+ghidra4@users.noreply.github.com>
Date: Wed, 24 Apr 2019 10:37:34 -0400
Subject: [PATCH] Removed configuration in doFirst from utilityJar to prevent
 skipped task.

---
 .../GhidraDev/GhidraDevPlugin/build.gradle            | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/build.gradle b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/build.gradle
index 6adf9076ee..620adfa405 100644
--- a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/build.gradle
+++ b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/build.gradle
@@ -51,11 +51,14 @@ File pyDevDestDir = file("build/data/buildDependencies/pydev")
 File cdtDestDir = file("build/data/buildDependencies/cdt")
 
 task utilityJar(type:Copy) {
-	doFirst {
-		from (project(':Utility').jar)
-	}
-
 	destinationDir libraryJarDestDir
+
+	// Explicitly add output from Utility:jar task.
+	// Using "project(':Utility').jar" will not compile here, and 
+	// adding configuration in doFirst would result in task always 
+	// up-to-date.
+	from tasks.getByPath(':Utility:jar').outputs
+		into destinationDir
 }
 
 task launchSupportJar(type:Copy) {