Update to use junit submodule (#198)

jbee · May 24, 2024 · 9b08e38 · 9b08e38
1 parent 48cef5b
commit 9b08e38
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 33 deletions.
diff --git a/.bach/src/Project.java b/.bach/src/Project.java
@@ -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");
@@ -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()));
   }
 

diff --git a/.bach/src/run/bach b/.bach/src/run/bach
diff --git a/.bach/src/run/info/org/junit b/.bach/src/run/info/org/junit
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,5 @@
-
-
+_site/
 target/
 src/doc/
-lib/*.jar
 pom.*
 *~
-
-_site/
diff --git a/.gitmodules b/.gitmodules
@@ -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
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/lib/.gitignore b/lib/.gitignore
@@ -0,0 +1 @@
+*.jar
diff --git a/lib/junit@5.10.2.properties b/lib/junit@5.10.2.properties
+0 −71		Bach.java
+128 −0		ModuleFinders.java
+143 −0		ModuleResolver.java
+6 −6		ToolInstaller.java
+5 −0		ToolRunner.java
+0 −59		external/Ant.java
+0 −53		external/GoogleJavaFormat.java
+0 −58		external/Maven.java
+0 −62		external/ModuleLookup.java
+0 −33		external/ModuleLookupTable.java
+0 −102		external/OperatingSystem.java
+0 −7		external/package-info.java
+0 −113		internal/JavaToolInstaller.java
+4 −8		internal/ModuleDescriptorSupport.java
+4 −1		internal/PathSupport.java
+13 −2		workflow/Cleaner.java
+63 −0		workflow/Folders.java
+7 −88		workflow/Restorer.java
+9 −10		workflow/Structure.java
+6 −5		workflow/Workflow.java