Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions src/main/java/org/gradlex/javamodule/packaging/tasks/Jpackage.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -112,7 +114,7 @@ public abstract class Jpackage extends DefaultTask {
public abstract DirectoryProperty getDestination();

/**
* To copy resources before adding them. This allows ressource filtering via Gradle
* To copy resources before adding them. This allows resource filtering via Gradle
* FileCollection and FileTree APIs.
*/
@Internal
Expand Down Expand Up @@ -235,15 +237,15 @@ private void performAppImageStep(String jpackage, Directory resourcesDir) {
}

private void configureJPackageArguments(ExecSpec e, Directory resourcesDir) {
String argsFile = createArgsFile(getModulePath().getAsPath());
e.args(
"--module",
getMainModule().get(),
"--resource-dir",
resourcesDir.getAsFile().getPath(),
"--app-version",
getVersion().get(),
"--module-path",
getModulePath().getAsPath(),
argsFile,
"--name",
getApplicationName().get());
if (getApplicationDescription().isPresent()) {
Expand All @@ -269,6 +271,18 @@ private void configureJPackageArguments(ExecSpec e, Directory resourcesDir) {
}
}

private String createArgsFile(String modulePathAsPath) {
Path argsFile = getTemporaryDir().toPath().resolve("args.txt");
List<String> lines = new ArrayList<>(1);
lines.add("--module-path " + modulePathAsPath);
try {
Files.write(argsFile, lines);
} catch (IOException e) {
throw new RuntimeException(e);
}
return "@" + argsFile.toString();
}

private void generateChecksums() throws NoSuchAlgorithmException, IOException {
File destination = getDestination().get().getAsFile();
List<File> allFiles = Arrays.stream(requireNonNull(destination.listFiles()))
Expand Down