refactoring and new duplicatesStrategy property on PackageTask

Author: fvarrui

src/main/java/io/github/fvarrui/javapackager/gradle/CopyDependencies.java

@@ -3,7 +3,6 @@
 import java.io.File;
 
 import org.gradle.api.Project;
-import org.gradle.api.file.DuplicatesStrategy;
 import org.gradle.api.tasks.Copy;
 
 import io.github.fvarrui.javapackager.packagers.ArtifactGenerator;
@@ -36,7 +35,7 @@ protected File doApply(Packager packager) {
 		if (copyLibsTask == null) {
 			copyLibsTask = project.getTasks().create("copyLibs", Copy.class);
 		}
-		copyLibsTask.setDuplicatesStrategy(DuplicatesStrategy.EXCLUDE);
+		copyLibsTask.setDuplicatesStrategy(Context.getGradleContext().getDuplicatesStrategy());
 		copyLibsTask.from(project.getConfigurations().getByName("runtimeClasspath"));
 		copyLibsTask.into(project.file(libsFolder));
 		copyLibsTask.getActions().forEach(action -> action.execute(copyLibsTask));

src/main/java/io/github/fvarrui/javapackager/gradle/CreateWindowsExeLaunch4j.java

@@ -5,7 +5,6 @@
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
-import org.gradle.api.file.DuplicatesStrategy;
 
 import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask;
 import io.github.fvarrui.javapackager.model.WindowsConfig;
@@ -50,7 +49,7 @@ protected File doApply(WindowsPackager packager) throws Exception {
 		}
 
 		Launch4jLibraryTask l4jTask = Context.getGradleContext().getLibraryTask();
-		l4jTask.getDuplicatesStrategy().set(DuplicatesStrategy.EXCLUDE);
+		l4jTask.getDuplicatesStrategy().set(Context.getGradleContext().getDuplicatesStrategy());
 		l4jTask.getOutputs().upToDateWhen(task -> false);
 		l4jTask.getHeaderType().set(winConfig.getHeaderType().toString());
 		l4jTask.getJarFiles().set(Context.getGradleContext().getProject().files(jarPath));

src/main/java/io/github/fvarrui/javapackager/gradle/DefaultPackageTask.java

@@ -4,6 +4,7 @@
 
 import io.github.fvarrui.javapackager.packagers.*;
 import org.gradle.api.Project;
+import org.gradle.api.file.DuplicatesStrategy;
 import org.gradle.api.internal.provider.Providers;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.plugins.JavaPluginExtension;
@@ -20,8 +21,8 @@
 public class GradleContext extends Context<Logger> {
 
 	private Project project;
-
 	private Launch4jLibraryTask libraryTask;
+	private DuplicatesStrategy duplicatesStrategy;
 
 	public GradleContext(Project project) {
 		super();
@@ -80,6 +81,14 @@ public void setLibraryTask(Launch4jLibraryTask libraryTask) {
 		this.libraryTask = libraryTask;
 	}
 
+	public DuplicatesStrategy getDuplicatesStrategy() {
+		return duplicatesStrategy;
+	}
+	
+	public void setDuplicatesStrategy(DuplicatesStrategy duplicatesStrategy) {
+		this.duplicatesStrategy = duplicatesStrategy;
+	}
+	
 	/**
 	 * Returns project's default toolchain
 	 * 

src/main/java/io/github/fvarrui/javapackager/gradle/GradleContext.java

@@ -25,7 +25,7 @@ public void apply(Project project) {
 		project.getPluginManager().apply("edu.sc.seis.launch4j");		
 
 		project.getExtensions().create(SETTINGS_EXT_NAME, PackagePluginExtension.class, project);
-		project.getTasks().create(PACKAGE_TASK_NAME, DefaultPackageTask.class).dependsOn("build");
+		project.getTasks().create(PACKAGE_TASK_NAME, PackageTask.class).dependsOn("build");
 
 		Context.getGradleContext().setLibraryTask(project.getTasks().create("launch4j_" + UUID.randomUUID(), Launch4jLibraryTask.class));
 

src/main/java/io/github/fvarrui/javapackager/gradle/LinuxTaskConfig.java

@@ -5,6 +5,7 @@
 import java.util.HashMap;
 
 import org.gradle.api.Project;
+import org.gradle.api.file.DuplicatesStrategy;
 
 import groovy.lang.Closure;
 import io.github.fvarrui.javapackager.model.Arch;
@@ -22,6 +23,7 @@
 public class PackagePluginExtension extends PackagerSettings {
 
 	private Project project;
+	private DuplicatesStrategy duplicatesStrategy;
 
 	public PackagePluginExtension(Project project) {
 		super();
@@ -54,6 +56,7 @@ public PackagePluginExtension(Project project) {
 		this.scripts = new Scripts();
 		this.forceInstaller = false;
 		this.arch = Arch.getDefault();
+		this.duplicatesStrategy = DuplicatesStrategy.WARN;
 	}
 
     public LinuxConfig linuxConfig(Closure<LinuxConfig> closure) {
@@ -85,5 +88,13 @@ public Scripts scripts(Closure<Scripts> closure) {
         project.configure(scripts, closure);
         return scripts;
     }
+    
+    public void setDuplicatesStrategy(DuplicatesStrategy duplicatesStrategy) {
+		this.duplicatesStrategy = duplicatesStrategy;
+	}
+    
+    public DuplicatesStrategy getDuplicatesStrategy() {
+		return duplicatesStrategy;
+	}
 
 }

src/main/java/io/github/fvarrui/javapackager/gradle/PackagePlugin.java

@@ -7,6 +7,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.gradle.api.file.DuplicatesStrategy;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputDirectory;
 import org.gradle.api.tasks.InputFile;
@@ -585,6 +586,18 @@ public List<Template> getTemplates() {
 	public void setTemplates(List<Template> templates) {
 		this.templates = templates;
 	}
+	
+	@Input
+	@Optional
+	private DuplicatesStrategy duplicatesStrategy;
+	
+	public DuplicatesStrategy getDuplicatesStrategy() {
+		return duplicatesStrategy;
+	}
+	
+	public void setDuplicatesStrategy(DuplicatesStrategy duplicatesStrategy) {
+		this.duplicatesStrategy = duplicatesStrategy;
+	}
 
 	// ===============
 	// create packager
@@ -596,6 +609,8 @@ protected Packager createPackager() throws Exception {
 
 		PackagePluginExtension extension = getProject().getExtensions().findByType(PackagePluginExtension.class);
 
+		Context.getGradleContext().setDuplicatesStrategy(defaultIfNull(duplicatesStrategy, extension.getDuplicatesStrategy()));
+		
 		return
 			(Packager) PackagerFactory
 				.createPackager(defaultIfNull(platform, extension.getPlatform()))

src/main/java/io/github/fvarrui/javapackager/gradle/PackagePluginExtension.java

@@ -79,7 +79,7 @@ public static boolean isGradle() {
 		return context instanceof GradleContext; 
 	}
 
-	public static MavenContext getMavenContext() {
+	public static MavenContext getMavenContext() {		
 		return (MavenContext) context;
 	}