Commit f83c6aa7 authored by Dave Syer's avatar Dave Syer Committed by Phillip Webb

Grab main class from "run" task if it exists

Fixes gh-1099
parent d6a14c2b
...@@ -114,13 +114,16 @@ public class RepackageTask extends DefaultTask { ...@@ -114,13 +114,16 @@ public class RepackageTask extends DefaultTask {
} }
private void setMainClass(Repackager repackager) { private void setMainClass(Repackager repackager) {
repackager.setMainClass((String) getProject().property("mainClassName")); String mainClass = (String) getProject().property("mainClassName");
if (this.extension.getMainClass() != null) {
repackager.setMainClass(this.extension.getMainClass());
}
if (RepackageTask.this.mainClass != null) { if (RepackageTask.this.mainClass != null) {
repackager.setMainClass(RepackageTask.this.mainClass); mainClass = RepackageTask.this.mainClass;
} } else if (this.extension.getMainClass() != null) {
mainClass = this.extension.getMainClass();
} else if (getProject().getTasks().getByName("run").hasProperty("main")) {
mainClass = (String) getProject().getTasks().getByName("run").property("main");
}
getLogger().info("Setting mainClass: " + mainClass);
repackager.setMainClass(mainClass);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment