Move demo programs into a dedicated package

sormuras · May 23, 2024 · ee7456e · ee7456e
1 parent 8654903
commit ee7456e
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 20 deletions.
diff --git a/.bach/src/run.bach/run/Format.java b/.bach/src/run.bach/run/Format.java
@@ -1,6 +1,6 @@
 package run;
 
-import run.external.GoogleJavaFormat;
+import run.demo.GoogleJavaFormat;
 
 class Format {
   public static void main(String... args) {

diff --git a/.bach/src/run.bach/run/external/Ant.java → .bach/src/run.bach/run/demo/Ant.java b/.bach/src/run.bach/run/external/Ant.java → .bach/src/run.bach/run/demo/Ant.java
@@ -3,7 +3,7 @@
  * Licensed under the Universal Permissive License v 1.0 -> https://opensource.org/license/upl
  */
 
-package run.external;
+package run.demo;
 
 import java.net.URI;
 import java.nio.file.Files;

diff --git a/...n.bach/run/external/GoogleJavaFormat.java → ...c/run.bach/run/demo/GoogleJavaFormat.java b/...n.bach/run/external/GoogleJavaFormat.java → ...c/run.bach/run/demo/GoogleJavaFormat.java
@@ -3,7 +3,7 @@
  * Licensed under the Universal Permissive License v 1.0 -> https://opensource.org/license/upl
  */
 
-package run.external;
+package run.demo;
 
 import java.net.URI;
 import java.nio.file.Files;

diff --git a/.bach/src/run.bach/run/Greeter.java → .bach/src/run.bach/run/demo/Greeter.java b/.bach/src/run.bach/run/Greeter.java → .bach/src/run.bach/run/demo/Greeter.java
@@ -1,4 +1,4 @@
-package run;
+package run.demo;
 
 import java.nio.file.Files;
 import java.nio.file.Path;

diff --git a/...h/src/run.bach/run/external/JResolve.java → .bach/src/run.bach/run/demo/JResolve.java b/...h/src/run.bach/run/external/JResolve.java → .bach/src/run.bach/run/demo/JResolve.java
@@ -1,4 +1,4 @@
-package run.external;
+package run.demo;
 
 /**
  * JResolve - a command line tool for resolving dependencies on the JVM.

diff --git a/.bach/src/run.bach/run/JResolveDemo.java → ...h/src/run.bach/run/demo/JResolveDemo.java b/.bach/src/run.bach/run/JResolveDemo.java → ...h/src/run.bach/run/demo/JResolveDemo.java
@@ -1,4 +1,4 @@
-package run;
+package run.demo;
 
 import run.bach.*;
 

diff --git a/.bach/src/run.bach/run/external/Maven.java → .bach/src/run.bach/run/demo/Maven.java b/.bach/src/run.bach/run/external/Maven.java → .bach/src/run.bach/run/demo/Maven.java
@@ -3,7 +3,7 @@
  * Licensed under the Universal Permissive License v 1.0 -> https://opensource.org/license/upl
  */
 
-package run.external;
+package run.demo;
 
 import java.net.URI;
 import java.nio.file.Files;

diff --git a/...external/MavenRepositoryModuleFinder.java → ...run/demo/MavenRepositoryModuleFinder.java b/...external/MavenRepositoryModuleFinder.java → ...run/demo/MavenRepositoryModuleFinder.java
@@ -1,4 +1,4 @@
-package run.external;
+package run.demo;
 
 import java.lang.module.ModuleFinder;
 import java.lang.module.ModuleReference;

diff --git a/.../src/run.bach/run/ModuleResolverDemo.java → ...run.bach/run/demo/ModuleResolverDemo.java b/.../src/run.bach/run/ModuleResolverDemo.java → ...run.bach/run/demo/ModuleResolverDemo.java
@@ -1,4 +1,4 @@
-package run;
+package run.demo;
 
 import bach.info.org.jreleaser.JReleaser;
 import bach.info.org.junit.JUnit;
@@ -8,7 +8,6 @@
 import run.bach.ModuleResolver;
 import run.bach.ToolFinder;
 import run.bach.workflow.Folders;
-import run.external.Ant;
 
 public class ModuleResolverDemo {
   public static void main(String... args) throws Exception {

diff --git a/.bach/src/run.bach/run/ToolFinderDemo.java → ...src/run.bach/run/demo/ToolFinderDemo.java b/.bach/src/run.bach/run/ToolFinderDemo.java → ...src/run.bach/run/demo/ToolFinderDemo.java
@@ -1,14 +1,11 @@
-package run;
+package run.demo;
 
 import java.io.*;
 import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.function.Consumer;
 import java.util.spi.*;
 import run.bach.*;
-import run.external.Ant;
-import run.external.GoogleJavaFormat;
-import run.external.Maven;
 
 class ToolFinderDemo {
   public static void main(String... args) {

diff --git a/.bach/src/run.bach/run/ToolSpaceDemo.java → .../src/run.bach/run/demo/ToolSpaceDemo.java b/.bach/src/run.bach/run/ToolSpaceDemo.java → .../src/run.bach/run/demo/ToolSpaceDemo.java
@@ -1,7 +1,6 @@
-package run;
+package run.demo;
 
 import run.bach.*;
-import run.external.Maven;
 
 class ToolSpaceDemo extends ToolSpace {
   public static void main(String... args) {

diff --git a/.bach/src/run.bach/run/Versions.java → ...c/run.bach/run/demo/ToolVersionsDemo.java b/.bach/src/run.bach/run/Versions.java → ...c/run.bach/run/demo/ToolVersionsDemo.java
@@ -1,9 +1,8 @@
-package run;
+package run.demo;
 
 import run.bach.*;
-import run.external.*;
 
-class Versions {
+class ToolVersionsDemo {
   public static void main(String... args) {
     // 1-shot, tool provider
     Tool.of("jar").run("--version");

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,6 +27,6 @@ jobs:
           java @bach jar --version
           java @bach jfr --version
           java @bach https://raw.githubusercontent.com/openjdk/jdk/jdk-22-ga/test/jdk/java/lang/System/Versions.java
-          java .bach/src/run.bach/run/Versions.java
+          java .bach/src/run.bach/run/demo/ToolVersionsDemo.java
       - name: 'Build Bach with Bach'
         run: java @build