Skip to content

Commit

Permalink
Add jreleaser submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
sormuras committed May 28, 2024
1 parent 5692481 commit 942ac78
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 23 deletions.
35 changes: 12 additions & 23 deletions .bach/src/run.bach/run/demo/ModuleResolverDemo.java
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand All @@ -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");
}
}
1 change: 1 addition & 0 deletions .bach/src/run.bach/run/info/org/jreleaser
Submodule jreleaser added at 7bdd3d
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 942ac78

Please sign in to comment.