From 942ac7863228910a39bd51fb3f03135b92777019 Mon Sep 17 00:00:00 2001 From: Christian Stein Date: Tue, 28 May 2024 12:41:09 +0200 Subject: [PATCH] Add `jreleaser` submodule --- .../run.bach/run/demo/ModuleResolverDemo.java | 35 +++++++------------ .bach/src/run.bach/run/info/org/jreleaser | 1 + .gitmodules | 3 ++ .idea/vcs.xml | 1 + 4 files changed, 17 insertions(+), 23 deletions(-) create mode 160000 .bach/src/run.bach/run/info/org/jreleaser diff --git a/.bach/src/run.bach/run/demo/ModuleResolverDemo.java b/.bach/src/run.bach/run/demo/ModuleResolverDemo.java index ba9adbb9f..ab891235b 100644 --- a/.bach/src/run.bach/run/demo/ModuleResolverDemo.java +++ b/.bach/src/run.bach/run/demo/ModuleResolverDemo.java @@ -2,20 +2,18 @@ import java.lang.module.ModuleFinder; import java.nio.file.Path; - import jdk.jfr.consumer.RecordingStream; import run.bach.ModuleLocator; import run.bach.ModuleResolver; import run.bach.ToolFinder; +import run.bach.workflow.Folders; import run.info.bach.JavaFX; +import run.info.org.jreleaser.JReleaser; import run.info.org.junit.JUnit; public class ModuleResolverDemo { public static void main(String... args) throws Exception { - var libraries = ModuleLocator.compose( - JUnit.modules(), - JavaFX.version("22.0.1") - ); + var libraries = ModuleLocator.compose(JUnit.modules(), JavaFX.version("22.0.1")); var lib = Path.of("lib"); try (var recording = new RecordingStream()) { @@ -28,34 +26,25 @@ public static void main(String... args) throws Exception { recording.stop(); } - // // "jreleaser" via the tool provider SPI - // var jreleaserHome = - // Folders.ofCurrentWorkingDirectory().tool(JReleaser.NAME + "@" + JReleaser.VERSION); - // var jreleaserResolver = ModuleResolver.ofSingleDirectory(jreleaserHome, - // JReleaser.MODULES); - // jreleaserResolver.resolveModule("org.jreleaser.tool"); - // jreleaserResolver.resolveMissingModules(); + // "jreleaser" via the tool provider SPI + var jreleaserHome = Folders.ofCurrentWorkingDirectory().tool("jreleaser@" + JReleaser.VERSION); + var jreleaserResolver = ModuleResolver.ofSingleDirectory(jreleaserHome, JReleaser.MODULES); + jreleaserResolver.resolveModule("org.jreleaser.tool"); + jreleaserResolver.resolveMissingModules(); var tools = ToolFinder.compose( ToolFinder.of("jar"), // provides "jar" tool 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.APPLICATION) - // .withJavaApplication( - // "demo/release@all", JReleaser.APPLICATION, - // JReleaser.APPLICATION_ASSETS) - ); + ToolFinder.of(ModuleFinder.of(jreleaserHome)), // provides "jreleaser" tool + ToolFinder.ofInstaller().withJavaApplication("demo/release@uri", JReleaser.URI)); var junit = tools.get("junit"); junit.run("--version"); junit.run("engines"); - // tools.get("jreleaser").run("--version"); - // tools.get("releaser1").run("--version"); - // tools.get("releaser2").run("--version"); + tools.get("jreleaser").run("--version"); + tools.get("release@uri").run("--version"); } } diff --git a/.bach/src/run.bach/run/info/org/jreleaser b/.bach/src/run.bach/run/info/org/jreleaser new file mode 160000 index 000000000..7bdd3dc9b --- /dev/null +++ b/.bach/src/run.bach/run/info/org/jreleaser @@ -0,0 +1 @@ +Subproject commit 7bdd3dc9bf5eee7f1ce0104908242108aee12bb2 diff --git a/.gitmodules b/.gitmodules index b10a7fc48..02e15070b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "run.info.bach"] path = .bach/src/run.bach/run/info/bach url = https://github.com/sormuras/bach-info +[submodule "jreleaser"] + path = .bach/src/run.bach/run/info/org/jreleaser + url = https://github.com/jreleaser/bach-info diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 870430390..92abc07e0 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -17,6 +17,7 @@ + \ No newline at end of file