Skip to content

Commit 02c894b

Browse files
fvarruifvarrui
committed
U artifact generators refactored
1 parent 312064a commit 02c894b

27 files changed

+143
-161
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/**
1313
* Copies all dependencies to app folder on Maven context
1414
*/
15-
public class CopyDependencies extends ArtifactGenerator {
15+
public class CopyDependencies extends ArtifactGenerator<Packager> {
1616

1717
public Copy copyLibsTask;
1818

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/**
1919
* Creates a runnable jar file from sources on Maven context
2020
*/
21-
public class CreateRunnableJar extends ArtifactGenerator {
21+
public class CreateRunnableJar extends ArtifactGenerator<Packager> {
2222

2323
public CreateRunnableJar() {
2424
super("Runnable JAR");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
/**
1616
* Creates tarball (tar.gz file) on Gradle context
1717
*/
18-
public class CreateTarball extends ArtifactGenerator {
18+
public class CreateTarball extends ArtifactGenerator<Packager> {
1919

2020
public CreateTarball() {
2121
super("Tarball");

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

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask;
1111
import io.github.fvarrui.javapackager.model.WindowsConfig;
1212
import io.github.fvarrui.javapackager.packagers.Context;
13-
import io.github.fvarrui.javapackager.packagers.Packager;
1413
import io.github.fvarrui.javapackager.packagers.WindowsArtifactGenerator;
1514
import io.github.fvarrui.javapackager.packagers.WindowsPackager;
1615
import io.github.fvarrui.javapackager.utils.FileUtils;
@@ -30,23 +29,21 @@ public CreateWindowsExe() {
3029
}
3130

3231
@Override
33-
protected File doApply(Packager packager) throws Exception {
32+
protected File doApply(WindowsPackager packager) throws Exception {
3433

35-
WindowsPackager windowsPackager = (WindowsPackager) packager;
36-
37-
List<String> vmArgs = windowsPackager.getVmArgs();
38-
WindowsConfig winConfig = windowsPackager.getWinConfig();
39-
File executable = windowsPackager.getExecutable();
40-
String mainClass = windowsPackager.getMainClass();
41-
boolean useResourcesAsWorkingDir = windowsPackager.isUseResourcesAsWorkingDir();
42-
boolean bundleJre = windowsPackager.getBundleJre();
43-
String jreDirectoryName = windowsPackager.getJreDirectoryName();
44-
String jreMinVersion = windowsPackager.getJreMinVersion();
45-
File jarFile = windowsPackager.getJarFile();
34+
List<String> vmArgs = packager.getVmArgs();
35+
WindowsConfig winConfig = packager.getWinConfig();
36+
File executable = packager.getExecutable();
37+
String mainClass = packager.getMainClass();
38+
boolean useResourcesAsWorkingDir = packager.isUseResourcesAsWorkingDir();
39+
boolean bundleJre = packager.getBundleJre();
40+
String jreDirectoryName = packager.getJreDirectoryName();
41+
String jreMinVersion = packager.getJreMinVersion();
42+
File jarFile = packager.getJarFile();
4643

4744
try {
4845
// creates a folder only for launch4j assets
49-
createAssets(windowsPackager);
46+
createAssets(packager);
5047
} catch (Exception ex) {
5148
throw new RuntimeException(ex);
5249
}
@@ -61,7 +58,7 @@ protected File doApply(Packager packager) throws Exception {
6158
l4jTask.setIcon(genericIcon.getAbsolutePath());
6259
l4jTask.setManifest(genericManifest.getAbsolutePath());
6360
l4jTask.setMainClassName(mainClass);
64-
l4jTask.setClasspath(new HashSet<>(windowsPackager.getClasspaths()));
61+
l4jTask.setClasspath(new HashSet<>(packager.getClasspaths()));
6562
l4jTask.setChdir(useResourcesAsWorkingDir ? "." : "");
6663
l4jTask.setBundledJrePath(bundleJre ? jreDirectoryName : "%JAVA_HOME%");
6764
if (!StringUtils.isBlank(jreMinVersion)) {
@@ -80,7 +77,7 @@ protected File doApply(Packager packager) throws Exception {
8077
l4jTask.setLibraryDir("");
8178
l4jTask.getActions().forEach(action -> action.execute(l4jTask));
8279

83-
sign(genericExe, windowsPackager);
80+
sign(genericExe, packager);
8481

8582
FileUtils.copyFileToFile(genericExe, executable);
8683

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/**
1515
* Creates zipball (zip file) on Gradle context
1616
*/
17-
public class CreateZipball extends ArtifactGenerator {
17+
public class CreateZipball extends ArtifactGenerator<Packager> {
1818

1919
public CreateZipball() {
2020
super("Zipball");

‎src/main/java/io/github/fvarrui/javapackager/gradle/GenerateDeb.java‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,28 @@
11
package io.github.fvarrui.javapackager.gradle;
22

33
import java.io.File;
4-
import java.util.UUID;
5-
6-
import com.netflix.gradle.plugins.deb.Deb;
74

85
import io.github.fvarrui.javapackager.packagers.ArtifactGenerator;
9-
import io.github.fvarrui.javapackager.packagers.Context;
106
import io.github.fvarrui.javapackager.packagers.LinuxPackager;
11-
import io.github.fvarrui.javapackager.packagers.Packager;
127
import io.github.fvarrui.javapackager.utils.Logger;
13-
import io.github.fvarrui.javapackager.utils.VelocityUtils;
148

159
/**
1610
* Creates a DEB package file including all app folder's content only for
1711
* GNU/Linux so app could be easily distributed on Gradle context
1812
*/
19-
public class GenerateDeb extends ArtifactGenerator {
13+
public class GenerateDeb extends ArtifactGenerator<LinuxPackager> {
2014

2115
public GenerateDeb() {
2216
super("DEB package");
2317
}
2418

2519
@Override
26-
public boolean skip(Packager packager) {
20+
public boolean skip(LinuxPackager packager) {
2721
return !packager.getLinuxConfig().isGenerateDeb();
2822
}
2923

3024
@Override
31-
protected File doApply(Packager packager) throws Exception {
25+
protected File doApply(LinuxPackager packager) throws Exception {
3226

3327
Logger.warn("Sorry! " + getArtifactName() + " generation is not yet available");
3428
return null;
@@ -103,8 +97,8 @@ protected File doApply(Packager packager) throws Exception {
10397

10498
}
10599

106-
private Deb createDebTask() {
107-
return Context.getGradleContext().getProject().getTasks().create("createDeb_" + UUID.randomUUID(), Deb.class);
108-
}
100+
// private Deb createDebTask() {
101+
// return Context.getGradleContext().getProject().getTasks().create("createDeb_" + UUID.randomUUID(), Deb.class);
102+
// }
109103

110104
}

‎src/main/java/io/github/fvarrui/javapackager/gradle/GenerateRpm.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
import java.io.File;
44

55
import io.github.fvarrui.javapackager.packagers.ArtifactGenerator;
6-
import io.github.fvarrui.javapackager.packagers.Packager;
6+
import io.github.fvarrui.javapackager.packagers.LinuxPackager;
77
import io.github.fvarrui.javapackager.utils.Logger;
88

99
/**
1010
* Creates a RPM package file including all app folder's content only for
1111
* GNU/Linux so app could be easily distributed on Gradle context
1212
*/
13-
public class GenerateRpm extends ArtifactGenerator {
13+
public class GenerateRpm extends ArtifactGenerator<LinuxPackager> {
1414

1515
public GenerateRpm() {
1616
super("RPM package");
1717
}
1818

1919
@Override
20-
public boolean skip(Packager packager) {
20+
public boolean skip(LinuxPackager packager) {
2121
return !packager.getLinuxConfig().isGenerateRpm();
2222
}
2323

2424
@Override
25-
protected File doApply(Packager packager) throws Exception {
25+
protected File doApply(LinuxPackager packager) throws Exception {
2626

2727
Logger.warn("Sorry! " + getArtifactName() + " generation is not yet available");
2828

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import io.github.fvarrui.javapackager.packagers.Context;
99
import io.github.fvarrui.javapackager.packagers.Packager;
10+
import io.github.fvarrui.javapackager.packagers.WindowsPackager;
1011

1112
/**
1213
* Gradle context
@@ -65,7 +66,7 @@ public File resolveLicense(Packager packager) throws Exception {
6566
}
6667

6768
@Override
68-
public File createWindowsExe(Packager packager) throws Exception {
69+
public File createWindowsExe(WindowsPackager packager) throws Exception {
6970
return new CreateWindowsExe().apply(packager);
7071
}
7172

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/**
2121
* Copies all dependencies to app folder on Maven context
2222
*/
23-
public class CopyDependencies extends ArtifactGenerator {
23+
public class CopyDependencies extends ArtifactGenerator<Packager> {
2424

2525
public CopyDependencies() {
2626
super("Dependencies");

‎src/main/java/io/github/fvarrui/javapackager/maven/CreateRunnableJar.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
/**
2929
* Creates a runnable jar file from sources on Maven context
3030
*/
31-
public class CreateRunnableJar extends ArtifactGenerator {
31+
public class CreateRunnableJar extends ArtifactGenerator<Packager> {
3232

3333
public CreateRunnableJar() {
3434
super("Runnable JAR");

0 commit comments

Comments
 (0)