From ee7456e631eb5e28b95d4f341e37b9b9c07bb493 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Thu, 23 May 2024 22:46:38 +0200
Subject: [PATCH] Move demo programs into a dedicated package

---
 .bach/src/run.bach/run/Format.java                           | 2 +-
 .bach/src/run.bach/run/{external => demo}/Ant.java           | 2 +-
 .../run.bach/run/{external => demo}/GoogleJavaFormat.java    | 2 +-
 .bach/src/run.bach/run/{ => demo}/Greeter.java               | 2 +-
 .bach/src/run.bach/run/{external => demo}/JResolve.java      | 2 +-
 .bach/src/run.bach/run/{ => demo}/JResolveDemo.java          | 2 +-
 .bach/src/run.bach/run/{external => demo}/Maven.java         | 2 +-
 .../run/{external => demo}/MavenRepositoryModuleFinder.java  | 2 +-
 .bach/src/run.bach/run/{ => demo}/ModuleResolverDemo.java    | 3 +--
 .bach/src/run.bach/run/{ => demo}/ToolFinderDemo.java        | 5 +----
 .bach/src/run.bach/run/{ => demo}/ToolSpaceDemo.java         | 3 +--
 .../run/{Versions.java => demo/ToolVersionsDemo.java}        | 5 ++---
 .github/workflows/ci.yml                                     | 2 +-
 13 files changed, 14 insertions(+), 20 deletions(-)
 rename .bach/src/run.bach/run/{external => demo}/Ant.java (98%)
 rename .bach/src/run.bach/run/{external => demo}/GoogleJavaFormat.java (98%)
 rename .bach/src/run.bach/run/{ => demo}/Greeter.java (98%)
 rename .bach/src/run.bach/run/{external => demo}/JResolve.java (94%)
 rename .bach/src/run.bach/run/{ => demo}/JResolveDemo.java (96%)
 rename .bach/src/run.bach/run/{external => demo}/Maven.java (98%)
 rename .bach/src/run.bach/run/{external => demo}/MavenRepositoryModuleFinder.java (98%)
 rename .bach/src/run.bach/run/{ => demo}/ModuleResolverDemo.java (98%)
 rename .bach/src/run.bach/run/{ => demo}/ToolFinderDemo.java (97%)
 rename .bach/src/run.bach/run/{ => demo}/ToolSpaceDemo.java (94%)
 rename .bach/src/run.bach/run/{Versions.java => demo/ToolVersionsDemo.java} (96%)

diff --git a/.bach/src/run.bach/run/Format.java b/.bach/src/run.bach/run/Format.java
index 81c22b41d..5abec5804 100644
--- 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 b/.bach/src/run.bach/run/demo/Ant.java
similarity index 98%
rename from .bach/src/run.bach/run/external/Ant.java
rename to .bach/src/run.bach/run/demo/Ant.java
index 8ccd50d74..0922c2b34 100644
--- a/.bach/src/run.bach/run/external/Ant.java
+++ b/.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/.bach/src/run.bach/run/external/GoogleJavaFormat.java b/.bach/src/run.bach/run/demo/GoogleJavaFormat.java
similarity index 98%
rename from .bach/src/run.bach/run/external/GoogleJavaFormat.java
rename to .bach/src/run.bach/run/demo/GoogleJavaFormat.java
index b750069df..5ef0e3502 100644
--- a/.bach/src/run.bach/run/external/GoogleJavaFormat.java
+++ b/.bach/src/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 b/.bach/src/run.bach/run/demo/Greeter.java
similarity index 98%
rename from .bach/src/run.bach/run/Greeter.java
rename to .bach/src/run.bach/run/demo/Greeter.java
index ac6e803c1..6487a482b 100644
--- a/.bach/src/run.bach/run/Greeter.java
+++ b/.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/.bach/src/run.bach/run/external/JResolve.java b/.bach/src/run.bach/run/demo/JResolve.java
similarity index 94%
rename from .bach/src/run.bach/run/external/JResolve.java
rename to .bach/src/run.bach/run/demo/JResolve.java
index 860ad9bcf..b7cf1dd8f 100644
--- a/.bach/src/run.bach/run/external/JResolve.java
+++ b/.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 b/.bach/src/run.bach/run/demo/JResolveDemo.java
similarity index 96%
rename from .bach/src/run.bach/run/JResolveDemo.java
rename to .bach/src/run.bach/run/demo/JResolveDemo.java
index d79ebc3e4..c238c4214 100644
--- a/.bach/src/run.bach/run/JResolveDemo.java
+++ b/.bach/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 b/.bach/src/run.bach/run/demo/Maven.java
similarity index 98%
rename from .bach/src/run.bach/run/external/Maven.java
rename to .bach/src/run.bach/run/demo/Maven.java
index 57e11e70e..90a9843cf 100644
--- a/.bach/src/run.bach/run/external/Maven.java
+++ b/.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/.bach/src/run.bach/run/external/MavenRepositoryModuleFinder.java b/.bach/src/run.bach/run/demo/MavenRepositoryModuleFinder.java
similarity index 98%
rename from .bach/src/run.bach/run/external/MavenRepositoryModuleFinder.java
rename to .bach/src/run.bach/run/demo/MavenRepositoryModuleFinder.java
index 0914bf709..037cda3c6 100644
--- a/.bach/src/run.bach/run/external/MavenRepositoryModuleFinder.java
+++ b/.bach/src/run.bach/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/.bach/src/run.bach/run/ModuleResolverDemo.java b/.bach/src/run.bach/run/demo/ModuleResolverDemo.java
similarity index 98%
rename from .bach/src/run.bach/run/ModuleResolverDemo.java
rename to .bach/src/run.bach/run/demo/ModuleResolverDemo.java
index e85068a6d..c85c8e20f 100644
--- a/.bach/src/run.bach/run/ModuleResolverDemo.java
+++ b/.bach/src/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 b/.bach/src/run.bach/run/demo/ToolFinderDemo.java
similarity index 97%
rename from .bach/src/run.bach/run/ToolFinderDemo.java
rename to .bach/src/run.bach/run/demo/ToolFinderDemo.java
index b576d9893..baf0d1470 100644
--- a/.bach/src/run.bach/run/ToolFinderDemo.java
+++ b/.bach/src/run.bach/run/demo/ToolFinderDemo.java
@@ -1,4 +1,4 @@
-package run;
+package run.demo;
 
 import java.io.*;
 import java.util.*;
@@ -6,9 +6,6 @@
 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 b/.bach/src/run.bach/run/demo/ToolSpaceDemo.java
similarity index 94%
rename from .bach/src/run.bach/run/ToolSpaceDemo.java
rename to .bach/src/run.bach/run/demo/ToolSpaceDemo.java
index cfaeffd90..e4a9ce5cd 100644
--- a/.bach/src/run.bach/run/ToolSpaceDemo.java
+++ b/.bach/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 b/.bach/src/run.bach/run/demo/ToolVersionsDemo.java
similarity index 96%
rename from .bach/src/run.bach/run/Versions.java
rename to .bach/src/run.bach/run/demo/ToolVersionsDemo.java
index 811fcd95f..3d439b154 100644
--- a/.bach/src/run.bach/run/Versions.java
+++ b/.bach/src/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
index 5ed728ba0..8d038feaf 100644
--- 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