Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to use junit submodule #198

Merged
merged 1 commit into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions .bach/src/Project.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import java.io.File;
import java.lang.module.ModuleFinder;
import java.nio.file.Path;
import run.bach.Bach;
import run.bach.ModuleFinders;
import run.bach.ToolCall;
import run.bach.ToolRunner;
import run.bach.workflow.Builder;
import run.bach.workflow.Folders;
import run.bach.workflow.Structure;
import run.bach.workflow.Structure.*;
import run.bach.workflow.Structure.Basics;
import run.bach.workflow.Structure.DeclaredModule;
import run.bach.workflow.Structure.Space;
import run.bach.workflow.Structure.Spaces;
import run.bach.workflow.Workflow;
import run.info.org.junit.JUnit;

record Project(Workflow workflow) implements Builder {
static final String VERSION = System.getProperty("--project-version", "11-ea");
Expand All @@ -32,10 +38,11 @@ static Project ofCurrentWorkingDirectory() {
.with(testModule("test.examples"))
.with(testModule("test.integration"));

var libraries = ModuleFinder.compose(ModuleFinders.ofProperties(JUnit.MODULES));
return new Project(
new Workflow(
Bach.Folders.ofCurrentWorkingDirectory(),
new Structure(basics, new Spaces(main, test)),
Folders.ofCurrentWorkingDirectory(),
new Structure(basics, new Spaces(main, test), libraries),
ToolRunner.ofSystem()));
}

Expand Down
1 change: 1 addition & 0 deletions .bach/src/run/info/org/junit
Submodule junit added at c147fe
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@


_site/
target/
src/doc/
lib/*.jar
pom.*
*~

_site/
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule ".bach/src/run/bach"]
path = .bach/src/run/bach
url = https://github.com/sormuras/run.bach
[submodule "junit"]
path = .bach/src/run/info/org/junit
url = https://github.com/junit-team/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.

1 change: 1 addition & 0 deletions lib/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.jar
23 changes: 0 additions & 23 deletions lib/junit@5.10.2.properties

This file was deleted.