diff --git a/gradle.properties b/gradle.properties index f645f6f..c1ab82c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ woggioniMavenRepositoryUrl=https://woggioni.net/mvn/ publishMavenRepositoryUrl=https://mvn.woggioni.net/ -lys.version = 2023.10.05 +lys.version = 2024.02.24 -version.envelope=2023.10.05 +version.envelope=2024.02.28 version.gradle=7.6 diff --git a/src/main/java/net/woggioni/gradle/envelope/EnvelopeJarTask.java b/src/main/java/net/woggioni/gradle/envelope/EnvelopeJarTask.java index a3c7e7d..eb14bde 100644 --- a/src/main/java/net/woggioni/gradle/envelope/EnvelopeJarTask.java +++ b/src/main/java/net/woggioni/gradle/envelope/EnvelopeJarTask.java @@ -292,13 +292,17 @@ public abstract class EnvelopeJarTask extends AbstractArchiveTask { mainAttributes.put(new Attributes.Name("Can-Redefine-Classes"), "true"); mainAttributes.put(new Attributes.Name("Can-Retransform-Classes"), "true"); String separator = "" + Constants.EXTRA_CLASSPATH_ENTRY_SEPARATOR; - ListProperty extraClasspath = EnvelopeJarTask.this.getExtraClasspath(); - if(extraClasspath.isPresent()) { - String extraClasspathString = extraClasspath.get().stream() - .map(it -> it.replace(separator, separator + separator) - ).collect(Collectors.joining(separator)); - mainAttributes.put(new Attributes.Name(Constants.ManifestAttributes.EXTRA_CLASSPATH), extraClasspathString); - } + ListProperty extraClasspathProperty = EnvelopeJarTask.this.getExtraClasspath(); + java.util.Optional.of(extraClasspathProperty) + .filter(ListProperty::isPresent) + .map(ListProperty::get) + .filter(l -> !l.isEmpty()) + .ifPresent(extraClasspath -> { + String extraClasspathString = extraClasspath.stream() + .map(it -> it.replace(separator, separator + separator) + ).collect(Collectors.joining(separator)); + mainAttributes.put(new Attributes.Name(Constants.ManifestAttributes.EXTRA_CLASSPATH), extraClasspathString); + }); if(getMainClass().isPresent()) { mainAttributes.putValue(Constants.ManifestAttributes.MAIN_CLASS, getMainClass().get()); }