|
5 | 5 | import java.util.List; |
6 | 6 |
|
7 | 7 | import org.apache.commons.lang3.StringUtils; |
| 8 | +import org.gradle.api.file.DuplicatesStrategy; |
8 | 9 |
|
9 | 10 | import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask; |
10 | 11 | import io.github.fvarrui.javapackager.model.WindowsConfig; |
@@ -49,32 +50,33 @@ protected File doApply(WindowsPackager packager) throws Exception { |
49 | 50 | } |
50 | 51 |
|
51 | 52 | Launch4jLibraryTask l4jTask = Context.getGradleContext().getLibraryTask(); |
| 53 | + l4jTask.getDuplicatesStrategy().set(DuplicatesStrategy.EXCLUDE); |
52 | 54 | l4jTask.getOutputs().upToDateWhen(task -> false); |
53 | | - l4jTask.setHeaderType(winConfig.getHeaderType().toString()); |
54 | | - l4jTask.setJar(jarPath); |
55 | | - l4jTask.setDontWrapJar(!winConfig.isWrapJar()); |
56 | | - l4jTask.setOutfile(getGenericExe().getName()); |
57 | | - l4jTask.setIcon(getGenericIcon().getAbsolutePath()); |
58 | | - l4jTask.setManifest(getGenericManifest().getAbsolutePath()); |
59 | | - l4jTask.setMainClassName(mainClass); |
60 | | - l4jTask.setClasspath(new HashSet<>(packager.getClasspaths())); |
61 | | - l4jTask.setChdir(useResourcesAsWorkingDir ? "." : ""); |
| 55 | + l4jTask.getHeaderType().set(winConfig.getHeaderType().toString()); |
| 56 | + l4jTask.getJarFiles().set(Context.getGradleContext().getProject().files(jarPath)); |
| 57 | + l4jTask.getDontWrapJar().set(!winConfig.isWrapJar()); |
| 58 | + l4jTask.getOutfile().set(getGenericExe().getName()); |
| 59 | + l4jTask.getIcon().set(getGenericIcon().getAbsolutePath()); |
| 60 | + l4jTask.getManifest().set(getGenericManifest().getAbsolutePath()); |
| 61 | + l4jTask.getMainClassName().set(mainClass); |
| 62 | + l4jTask.getClasspath().set(new HashSet<>(packager.getClasspaths())); |
| 63 | + l4jTask.getChdir().set(useResourcesAsWorkingDir ? "." : ""); |
62 | 64 | if (bundleJre) { |
63 | | - l4jTask.setBundledJrePath(jreDirectoryName); |
| 65 | + l4jTask.getBundledJrePath().set(jreDirectoryName); |
64 | 66 | } |
65 | 67 | if (!StringUtils.isBlank(jreMinVersion)) { |
66 | | - l4jTask.setJreMinVersion(jreMinVersion); |
| 68 | + l4jTask.getJreMinVersion().set(jreMinVersion); |
67 | 69 | } |
68 | 70 | l4jTask.getJvmOptions().addAll(vmArgs); |
69 | | - l4jTask.setVersion(winConfig.getProductVersion()); |
70 | | - l4jTask.setTextVersion(winConfig.getTxtProductVersion()); |
71 | | - l4jTask.setCopyright(winConfig.getCopyright()); |
72 | | - l4jTask.setCompanyName(winConfig.getCompanyName()); |
73 | | - l4jTask.setFileDescription(winConfig.getFileDescription()); |
74 | | - l4jTask.setProductName(winConfig.getProductName()); |
75 | | - l4jTask.setInternalName(winConfig.getInternalName()); |
76 | | - l4jTask.setTrademarks(winConfig.getTrademarks()); |
77 | | - l4jTask.setLanguage(winConfig.getLanguage()); |
| 71 | + l4jTask.getVersion().set(winConfig.getProductVersion()); |
| 72 | + l4jTask.getTextVersion().set(winConfig.getTxtProductVersion()); |
| 73 | + l4jTask.getCopyright().set(winConfig.getCopyright()); |
| 74 | + l4jTask.getCompanyName().set(winConfig.getCompanyName()); |
| 75 | + l4jTask.getFileDescription().set(winConfig.getFileDescription()); |
| 76 | + l4jTask.getProductName().set(winConfig.getProductName()); |
| 77 | + l4jTask.getInternalName().set(winConfig.getInternalName()); |
| 78 | + l4jTask.getTrademarks().set(winConfig.getTrademarks()); |
| 79 | + l4jTask.getLanguage().set(winConfig.getLanguage()); |
78 | 80 | l4jTask.getActions().forEach(action -> action.execute(l4jTask)); |
79 | 81 |
|
80 | 82 | sign(getGenericExe(), packager); |
|
0 commit comments