Merge branch 'issue-103'

Author: fvarrui

.github/workflows/update-gradle-wrapper.yml

@@ -12,14 +12,19 @@
 /**
  * Copies all dependencies to app folder on Maven context
  */
-public class CopyDependencies extends ArtifactGenerator {
+public class CopyDependencies extends ArtifactGenerator<Packager> {
 
 	public Copy copyLibsTask;
 
 	public CopyDependencies() {
 		super("Dependencies");
 	}
 
+	@Override
+	public boolean skip(Packager packager) {
+		return !packager.getCopyDependencies();
+	}
+	
 	@Override
 	protected File doApply(Packager packager) {
 

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

@@ -18,7 +18,7 @@
 /**
  * Creates a runnable jar file from sources on Maven context
  */
-public class CreateRunnableJar extends ArtifactGenerator {
+public class CreateRunnableJar extends ArtifactGenerator<Packager> {
 
 	public CreateRunnableJar() {
 		super("Runnable JAR");

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

@@ -15,7 +15,7 @@
 /**
  * Creates tarball (tar.gz file) on Gradle context 
  */
-public class CreateTarball extends ArtifactGenerator {
+public class CreateTarball extends ArtifactGenerator<Packager> {
 
 	public CreateTarball() {
 		super("Tarball");

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

@@ -9,7 +9,6 @@
 import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask;
 import io.github.fvarrui.javapackager.model.WindowsConfig;
 import io.github.fvarrui.javapackager.packagers.Context;
-import io.github.fvarrui.javapackager.packagers.Packager;
 import io.github.fvarrui.javapackager.packagers.WindowsArtifactGenerator;
 import io.github.fvarrui.javapackager.packagers.WindowsPackager;
 import io.github.fvarrui.javapackager.utils.FileUtils;
@@ -29,23 +28,21 @@ public CreateWindowsExe() {
 	}
 
 	@Override
-	protected File doApply(Packager packager) throws Exception {
+	protected File doApply(WindowsPackager packager) throws Exception {
 
-		WindowsPackager windowsPackager = (WindowsPackager) packager;
-		
-		List<String> vmArgs = windowsPackager.getVmArgs();
-		WindowsConfig winConfig = windowsPackager.getWinConfig();
-		File executable = windowsPackager.getExecutable();
-		String mainClass = windowsPackager.getMainClass();
-		boolean useResourcesAsWorkingDir = windowsPackager.isUseResourcesAsWorkingDir();
-		boolean bundleJre = windowsPackager.getBundleJre();
-		String jreDirectoryName = windowsPackager.getJreDirectoryName();
-		String jreMinVersion = windowsPackager.getJreMinVersion();
-		File jarFile = windowsPackager.getJarFile();
+		List<String> vmArgs = packager.getVmArgs();
+		WindowsConfig winConfig = packager.getWinConfig();
+		File executable = packager.getExecutable();
+		String mainClass = packager.getMainClass();
+		boolean useResourcesAsWorkingDir = packager.isUseResourcesAsWorkingDir();
+		boolean bundleJre = packager.getBundleJre();
+		String jreDirectoryName = packager.getJreDirectoryName();
+		String jreMinVersion = packager.getJreMinVersion();
+		File jarFile = packager.getJarFile();
 
 		try {
 			// creates a folder only for launch4j assets
-			createAssets(windowsPackager);
+			createAssets(packager);
 		} catch (Exception ex) {
 			throw new RuntimeException(ex);
 		}
@@ -61,7 +58,7 @@ protected File doApply(Packager packager) throws Exception {
 		l4jTask.setIcon(genericIcon.getAbsolutePath());
 		l4jTask.setManifest(genericManifest.getAbsolutePath());
 		l4jTask.setMainClassName(mainClass);
-		l4jTask.setClasspath(new HashSet<>(windowsPackager.getClasspaths()));
+		l4jTask.setClasspath(new HashSet<>(packager.getClasspaths()));
 		l4jTask.setChdir(useResourcesAsWorkingDir ? "." : "");
 		l4jTask.setBundledJrePath(bundleJre ? jreDirectoryName : "%JAVA_HOME%;%PATH%");
 		if (!StringUtils.isBlank(jreMinVersion)) { 
@@ -80,7 +77,7 @@ protected File doApply(Packager packager) throws Exception {
 		l4jTask.setLibraryDir("");
 		l4jTask.getActions().forEach(action -> action.execute(l4jTask));
 
-		sign(genericExe, windowsPackager);
+		sign(genericExe, packager);
 
 		FileUtils.copyFileToFile(genericExe, executable);
 

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

@@ -14,7 +14,7 @@
 /**
  * Creates zipball (zip file)  on Gradle context
  */
-public class CreateZipball extends ArtifactGenerator {
+public class CreateZipball extends ArtifactGenerator<Packager> {
 
 	public CreateZipball() {
 		super("Zipball");

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

@@ -14,6 +14,7 @@
 import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask;
 import io.github.fvarrui.javapackager.packagers.Context;
 import io.github.fvarrui.javapackager.packagers.Packager;
+import io.github.fvarrui.javapackager.packagers.WindowsPackager;
 
 /**
  * Gradle context 
@@ -69,7 +70,7 @@ public File resolveLicense(Packager packager) throws Exception {
 	}
 
 	@Override
-	public File createWindowsExe(Packager packager) throws Exception {
+	public File createWindowsExe(WindowsPackager packager) throws Exception {
 		return new CreateWindowsExe().apply(packager);	
 	}
 

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

@@ -14,6 +14,7 @@
 import org.gradle.api.tasks.OutputDirectory;
 
 import groovy.lang.Closure;
+import io.github.fvarrui.javapackager.model.FileAssociation;
 import io.github.fvarrui.javapackager.model.LinuxConfig;
 import io.github.fvarrui.javapackager.model.MacConfig;
 import io.github.fvarrui.javapackager.model.Manifest;
@@ -527,7 +528,19 @@ public List<File> getAdditionalModulePaths() {
 	public void setAdditionalModulePaths(List<File> additionalModulePaths) {
 		this.additionalModulePaths = additionalModulePaths;
 	}
-    
+
+	@Input
+	@Optional
+	private List<FileAssociation> fileAssociations;
+	
+	public List<FileAssociation> getFileAssociations() {
+		return fileAssociations;
+	}
+	
+	public void setFileAssociations(List<FileAssociation> fileAssociations) {
+		this.fileAssociations = fileAssociations;
+	}
+
 	// ===============
 	// create packager
 	// ===============
@@ -556,6 +569,7 @@ protected Packager createPackager() throws Exception {
 					.displayName(defaultIfNull(displayName, extension.getDisplayName()))
 					.envPath(defaultIfNull(envPath, extension.getEnvPath()))
 					.extra(defaultIfNull(extra, extension.getExtra()))
+					.fileAssociations(defaultIfNull(fileAssociations, extension.getFileAssociations()))
 					.generateInstaller(defaultIfNull(generateInstaller, extension.getGenerateInstaller()))
 					.iconFile(defaultIfNull(iconFile, extension.getIconFile()))
 					.jdkPath(defaultIfNull(jdkPath, extension.getJdkPath()))

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

@@ -20,12 +20,17 @@
 /**
  * Copies all dependencies to app folder on Maven context
  */
-public class CopyDependencies extends ArtifactGenerator {
+public class CopyDependencies extends ArtifactGenerator<Packager> {
 
 	public CopyDependencies() {
 		super("Dependencies");
 	}
 
+	@Override
+	public boolean skip(Packager packager) {
+		return !packager.getCopyDependencies();
+	}
+	
 	@Override
 	protected File doApply(Packager packager) {
 

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

@@ -28,7 +28,7 @@
 /**
  * Creates a runnable jar file from sources on Maven context
  */
-public class CreateRunnableJar extends ArtifactGenerator {
+public class CreateRunnableJar extends ArtifactGenerator<Packager> {
 
 	public CreateRunnableJar() {
 		super("Runnable JAR");