diff --git a/.bach/src/run.bach/run/bach b/.bach/src/run.bach/run/bach index 17858210a..8780c5da1 160000 --- a/.bach/src/run.bach/run/bach +++ b/.bach/src/run.bach/run/bach @@ -1 +1 @@ -Subproject commit 17858210a05d27a3bf189a0ede666be34865f43a +Subproject commit 8780c5da1588562e7f5683407f4bf03bfd55bc0c diff --git a/.bach/src/run.bach/run/demo/ModuleResolverDemo.java b/.bach/src/run.bach/run/demo/ModuleResolverDemo.java index ab891235b..aab51c85a 100644 --- a/.bach/src/run.bach/run/demo/ModuleResolverDemo.java +++ b/.bach/src/run.bach/run/demo/ModuleResolverDemo.java @@ -22,10 +22,16 @@ public static void main(String... args) throws Exception { var resolver = ModuleResolver.ofSingleDirectory(lib, libraries); resolver.resolveModule("org.junit.jupiter"); // to write and discover tests resolver.resolveModule("org.junit.platform.console"); // to run tests + resolver.resolveModule("javafx.controls"); resolver.resolveMissingModules(); recording.stop(); } + ModuleFinder.of(lib).findAll().stream() + .map(ref -> ref.descriptor().toNameAndVersion() + " -> " + ref.location().orElseThrow()) + .sorted() + .forEach(System.out::println); + // "jreleaser" via the tool provider SPI var jreleaserHome = Folders.ofCurrentWorkingDirectory().tool("jreleaser@" + JReleaser.VERSION); var jreleaserResolver = ModuleResolver.ofSingleDirectory(jreleaserHome, JReleaser.MODULES); @@ -38,13 +44,13 @@ public static void main(String... args) throws Exception { ToolFinder.of("java"), // provides "java" tool ToolFinder.of(ModuleFinder.of(lib)), // provides "junit" tool ToolFinder.of(ModuleFinder.of(jreleaserHome)), // provides "jreleaser" tool - ToolFinder.ofInstaller().withJavaApplication("demo/release@uri", JReleaser.URI)); + ToolFinder.ofInstaller().withJavaApplication("jrelease@uri", JReleaser.URI)); var junit = tools.get("junit"); junit.run("--version"); junit.run("engines"); tools.get("jreleaser").run("--version"); - tools.get("release@uri").run("--version"); + tools.get("jrelease@uri").run("--version"); } } diff --git a/.bach/src/run.bach/run/info/bach b/.bach/src/run.bach/run/info/bach index dfa1b233b..22bce85d7 160000 --- a/.bach/src/run.bach/run/info/bach +++ b/.bach/src/run.bach/run/info/bach @@ -1 +1 @@ -Subproject commit dfa1b233b95fd7fabf2a25dfa9f9b57b47afb08a +Subproject commit 22bce85d7a252e126ab548169cbec3987bca383a