From 41392da1447b23a4af12a1311cd2bb9d7e376730 Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Sun, 12 May 2024 14:08:48 -0500 Subject: [PATCH] skip module info --- gradle-plugin/test-downgrade/build.gradle.kts | 1 + .../xyz/wagyourtail/jvmdg/compile/shade/ReferenceGraph.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/gradle-plugin/test-downgrade/build.gradle.kts b/gradle-plugin/test-downgrade/build.gradle.kts index 9a836a25..f19b46b2 100644 --- a/gradle-plugin/test-downgrade/build.gradle.kts +++ b/gradle-plugin/test-downgrade/build.gradle.kts @@ -57,6 +57,7 @@ val downgradeJar9 by tasks.creating(DowngradeJar::class) { inputFile.set(tasks.jar.get().archiveFile) archiveClassifier.set("downgraded-9") downgradeTo = JavaVersion.VERSION_1_9 + archiveVersion.set(props.getProperty("version") as String) } val shadeDowngradedApi9 by tasks.creating(ShadeAPI::class) { diff --git a/src/main/java/xyz/wagyourtail/jvmdg/compile/shade/ReferenceGraph.java b/src/main/java/xyz/wagyourtail/jvmdg/compile/shade/ReferenceGraph.java index 072e8bc4..5efc5c1b 100644 --- a/src/main/java/xyz/wagyourtail/jvmdg/compile/shade/ReferenceGraph.java +++ b/src/main/java/xyz/wagyourtail/jvmdg/compile/shade/ReferenceGraph.java @@ -34,6 +34,9 @@ public Map preScan(final Path root) throws IOException { Files.walkFileTree(root, new SimpleFileVisitor() { @Override public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + if (file.getFileName().toString().equals("module-info.class")) { + return FileVisitResult.CONTINUE; + } String path = root.relativize(file).toString(); if (path.endsWith(".class")) { path = path.substring(0, path.length() - 6);