Skip to content

Commit 4b16949

Browse files
committed
U fix exe creation tool classcastexception when running from gradle
1 parent 5063fc2 commit 4b16949

File tree

3 files changed

+39
-18
lines changed

3 files changed

+39
-18
lines changed

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@
1212
import org.gradle.jvm.toolchain.JavaToolchainSpec;
1313

1414
import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask;
15+
import io.github.fvarrui.javapackager.packagers.AbstractCreateWindowsExe;
1516
import io.github.fvarrui.javapackager.packagers.Context;
17+
import io.github.fvarrui.javapackager.packagers.CreateWindowsExeWinRun4j;
1618
import io.github.fvarrui.javapackager.packagers.Packager;
19+
import io.github.fvarrui.javapackager.packagers.WindowsPackager;
1720

1821
/**
1922
* Gradle context
@@ -109,4 +112,20 @@ private File getToolchain() {
109112

110113
}
111114

115+
@Override
116+
public File createWindowsExe(WindowsPackager packager) throws Exception {
117+
AbstractCreateWindowsExe createWindowsExe;
118+
switch (packager.getWinConfig().getExeCreationTool()) {
119+
case launch4j: createWindowsExe = new CreateWindowsExeLaunch4j(); break;
120+
case winrun4j: createWindowsExe = new CreateWindowsExeWinRun4j(); break;
121+
default: return null;
122+
}
123+
if (!createWindowsExe.skip(packager)) {
124+
return createWindowsExe.apply(packager);
125+
}
126+
return null;
127+
}
128+
129+
130+
112131
}

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55
import org.apache.maven.plugin.logging.Log;
66
import org.twdata.maven.mojoexecutor.MojoExecutor.ExecutionEnvironment;
77

8+
import io.github.fvarrui.javapackager.packagers.AbstractCreateWindowsExe;
89
import io.github.fvarrui.javapackager.packagers.Context;
10+
import io.github.fvarrui.javapackager.packagers.CreateWindowsExeWinRun4j;
911
import io.github.fvarrui.javapackager.packagers.Packager;
12+
import io.github.fvarrui.javapackager.packagers.WindowsPackager;
1013

1114
/**
1215
* Maven context
@@ -65,4 +68,20 @@ public File resolveLicense(Packager packager) throws Exception {
6568
return new ResolveLicenseFromPOM().apply(packager);
6669
}
6770

71+
@Override
72+
public File createWindowsExe(WindowsPackager packager) throws Exception {
73+
AbstractCreateWindowsExe createWindowsExe;
74+
switch (packager.getWinConfig().getExeCreationTool()) {
75+
case launch4j: createWindowsExe = new CreateWindowsExeLaunch4j(); break;
76+
case winrun4j: createWindowsExe = new CreateWindowsExeWinRun4j(); break;
77+
default: return null;
78+
}
79+
if (!createWindowsExe.skip(packager)) {
80+
return createWindowsExe.apply(packager);
81+
}
82+
return null;
83+
}
84+
85+
86+
6887
}

src/main/java/io/github/fvarrui/javapackager/packagers/Context.java

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.apache.commons.collections4.map.HashedMap;
99

1010
import io.github.fvarrui.javapackager.gradle.GradleContext;
11-
import io.github.fvarrui.javapackager.maven.CreateWindowsExeLaunch4j;
1211
import io.github.fvarrui.javapackager.maven.MavenContext;
1312
import io.github.fvarrui.javapackager.model.Platform;
1413

@@ -44,23 +43,7 @@ public Context() {
4443
public abstract File createTarball(Packager packager) throws Exception;
4544
public abstract File createZipball(Packager packager) throws Exception;
4645
public abstract File resolveLicense(Packager packager) throws Exception;
47-
48-
public File createWindowsExe(WindowsPackager packager) throws Exception {
49-
50-
AbstractCreateWindowsExe createWindowsExe;
51-
52-
switch (packager.getWinConfig().getExeCreationTool()) {
53-
case launch4j: createWindowsExe = new CreateWindowsExeLaunch4j(); break;
54-
case winrun4j: createWindowsExe = new CreateWindowsExeWinRun4j(); break;
55-
default: return null;
56-
}
57-
58-
if (!createWindowsExe.skip(packager)) {
59-
return createWindowsExe.apply(packager);
60-
}
61-
return null;
62-
63-
}
46+
public abstract File createWindowsExe(WindowsPackager packager) throws Exception;
6447

6548
// installer producers
6649

0 commit comments

Comments
 (0)