diff --git a/gradle.properties b/gradle.properties index 02e8974..94ffdc5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,5 +2,5 @@ gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven lys.version = 2024.12.28 -version.envelope=2024.12.31 +version.envelope=2025.01.08 diff --git a/loader/src/main/java11/net.woggioni.envelope.loader/JarFileModuleFinder.java b/loader/src/main/java11/net.woggioni.envelope.loader/JarFileModuleFinder.java index f2d34a6..dd5e02d 100644 --- a/loader/src/main/java11/net.woggioni.envelope.loader/JarFileModuleFinder.java +++ b/loader/src/main/java11/net.woggioni.envelope.loader/JarFileModuleFinder.java @@ -192,7 +192,7 @@ public class JarFileModuleFinder implements ModuleFinder { private static Set collectPackageNames(JarFile jarFile) { Set result = jarFile .versionedStream() - .filter(entry -> entry.getName().endsWith(".class")) + .filter(zipEntry -> !zipEntry.isDirectory()) .map(entry -> { String entryName = entry.getName(); int lastSlash = entryName.lastIndexOf('/'); diff --git a/src/main/java/net/woggioni/gradle/envelope/EnvelopePlugin.java b/src/main/java/net/woggioni/gradle/envelope/EnvelopePlugin.java index 16227fe..b7ff69e 100644 --- a/src/main/java/net/woggioni/gradle/envelope/EnvelopePlugin.java +++ b/src/main/java/net/woggioni/gradle/envelope/EnvelopePlugin.java @@ -12,11 +12,13 @@ import org.gradle.api.tasks.bundling.Jar; public class EnvelopePlugin implements Plugin { public static final String ENVELOPE_GROUP_NAME = "envelope"; + public static final String ENVELOPE_JAR_TASK_NAME = "envelopeJar"; + public static final String ENVELOPE_RUN_TASK_NAME = "envelopeRun"; @Override public void apply(Project project) { project.getPluginManager().apply(JavaPlugin.class); - Provider envelopeJarTaskProvider = project.getTasks().register("envelopeJar", EnvelopeJarTask.class, t -> { + Provider envelopeJarTaskProvider = project.getTasks().register(ENVELOPE_JAR_TASK_NAME, EnvelopeJarTask.class, t -> { t.setGroup(ENVELOPE_GROUP_NAME); t.setDescription("Package the application in a single executable jar file"); t.includeLibraries(project.getConfigurations().named(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME)); @@ -25,7 +27,7 @@ public class EnvelopePlugin implements Plugin { project.getTasks().named(BasePlugin.ASSEMBLE_TASK_NAME, DefaultTask.class, assembleTask -> { assembleTask.dependsOn(envelopeJarTaskProvider); }); - Provider envelopeRunTaskProvider = project.getTasks().register("envelopeRun", JavaExec.class, t -> { + Provider envelopeRunTaskProvider = project.getTasks().register(ENVELOPE_RUN_TASK_NAME, JavaExec.class, t -> { t.getInputs().files(envelopeJarTaskProvider); t.setGroup(ENVELOPE_GROUP_NAME); t.setDescription("Run the application in the envelope jar");