diff --git a/.github/workflows/graal-tests.yml b/.github/workflows/graal-tests.yml index 8a8c54f..c567516 100644 --- a/.github/workflows/graal-tests.yml +++ b/.github/workflows/graal-tests.yml @@ -26,8 +26,8 @@ jobs: - uses: actions/cache@v4 with: path: ~/.m2/repository - key: deps-${{ hashFiles('projects/main/project.clj') }} + key: deps-${{ hashFiles('main/project.clj') }} restore-keys: deps- - run: bb graal-tests - working-directory: projects/main + working-directory: main diff --git a/.github/workflows/main-tests.yml b/.github/workflows/main-tests.yml index 7e41d9d..8534ab9 100644 --- a/.github/workflows/main-tests.yml +++ b/.github/workflows/main-tests.yml @@ -24,8 +24,8 @@ jobs: id: cache-deps with: path: ~/.m2/repository - key: deps-${{ hashFiles('projects/main/project.clj') }} + key: deps-${{ hashFiles('main/project.clj') }} restore-keys: deps- - run: lein test-all - working-directory: projects/main + working-directory: main diff --git a/projects/handlers/consoles.cljc b/handlers/consoles.cljc similarity index 100% rename from projects/handlers/consoles.cljc rename to handlers/consoles.cljc diff --git a/projects/handlers/files.clj b/handlers/files.clj similarity index 100% rename from projects/handlers/files.clj rename to handlers/files.clj diff --git a/projects/handlers/open_telemetry.clj b/handlers/open_telemetry.clj similarity index 100% rename from projects/handlers/open_telemetry.clj rename to handlers/open_telemetry.clj diff --git a/projects/handlers/postal.clj b/handlers/postal.clj similarity index 100% rename from projects/handlers/postal.clj rename to handlers/postal.clj diff --git a/projects/handlers/slack.clj b/handlers/slack.clj similarity index 100% rename from projects/handlers/slack.clj rename to handlers/slack.clj diff --git a/projects/handlers/sockets.clj b/handlers/sockets.clj similarity index 100% rename from projects/handlers/sockets.clj rename to handlers/sockets.clj diff --git a/install.sh b/install.sh index 69556f3..bc5725c 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,5 @@ #!/bin/bash -cd projects/main; lein install; cd ../..; -cd projects/api; lein install; cd ../..; -cd projects/slf4j; lein install; cd ../..; +cd main; lein install; cd ..; +cd slf4j; lein install; cd ..; diff --git a/projects/main/.gitignore b/main/.gitignore similarity index 100% rename from projects/main/.gitignore rename to main/.gitignore diff --git a/projects/main/bb.edn b/main/bb.edn similarity index 100% rename from projects/main/bb.edn rename to main/bb.edn diff --git a/projects/main/bb/graal_tests.clj b/main/bb/graal_tests.clj similarity index 100% rename from projects/main/bb/graal_tests.clj rename to main/bb/graal_tests.clj diff --git a/projects/main/jaeger.sh b/main/jaeger.sh similarity index 100% rename from projects/main/jaeger.sh rename to main/jaeger.sh diff --git a/projects/main/project.clj b/main/project.clj similarity index 100% rename from projects/main/project.clj rename to main/project.clj diff --git a/projects/main/public/index.html b/main/public/index.html similarity index 100% rename from projects/main/public/index.html rename to main/public/index.html diff --git a/projects/main/resources/signal-docstrings/catch-to-error!.txt b/main/resources/signal-docstrings/catch-to-error!.txt similarity index 100% rename from projects/main/resources/signal-docstrings/catch-to-error!.txt rename to main/resources/signal-docstrings/catch-to-error!.txt diff --git a/projects/main/resources/signal-docstrings/environmental-config.txt b/main/resources/signal-docstrings/environmental-config.txt similarity index 100% rename from projects/main/resources/signal-docstrings/environmental-config.txt rename to main/resources/signal-docstrings/environmental-config.txt diff --git a/projects/main/resources/signal-docstrings/error!.txt b/main/resources/signal-docstrings/error!.txt similarity index 100% rename from projects/main/resources/signal-docstrings/error!.txt rename to main/resources/signal-docstrings/error!.txt diff --git a/projects/main/resources/signal-docstrings/event!.txt b/main/resources/signal-docstrings/event!.txt similarity index 100% rename from projects/main/resources/signal-docstrings/event!.txt rename to main/resources/signal-docstrings/event!.txt diff --git a/projects/main/resources/signal-docstrings/log!.txt b/main/resources/signal-docstrings/log!.txt similarity index 100% rename from projects/main/resources/signal-docstrings/log!.txt rename to main/resources/signal-docstrings/log!.txt diff --git a/projects/main/resources/signal-docstrings/signal!.txt b/main/resources/signal-docstrings/signal!.txt similarity index 100% rename from projects/main/resources/signal-docstrings/signal!.txt rename to main/resources/signal-docstrings/signal!.txt diff --git a/projects/main/resources/signal-docstrings/signal-content.txt b/main/resources/signal-docstrings/signal-content.txt similarity index 100% rename from projects/main/resources/signal-docstrings/signal-content.txt rename to main/resources/signal-docstrings/signal-content.txt diff --git a/projects/main/resources/signal-docstrings/signal-creators.txt b/main/resources/signal-docstrings/signal-creators.txt similarity index 100% rename from projects/main/resources/signal-docstrings/signal-creators.txt rename to main/resources/signal-docstrings/signal-creators.txt diff --git a/projects/main/resources/signal-docstrings/signal-options.txt b/main/resources/signal-docstrings/signal-options.txt similarity index 100% rename from projects/main/resources/signal-docstrings/signal-options.txt rename to main/resources/signal-docstrings/signal-options.txt diff --git a/projects/main/resources/signal-docstrings/spy!.txt b/main/resources/signal-docstrings/spy!.txt similarity index 100% rename from projects/main/resources/signal-docstrings/spy!.txt rename to main/resources/signal-docstrings/spy!.txt diff --git a/projects/main/resources/signal-docstrings/trace!.txt b/main/resources/signal-docstrings/trace!.txt similarity index 100% rename from projects/main/resources/signal-docstrings/trace!.txt rename to main/resources/signal-docstrings/trace!.txt diff --git a/projects/main/shadow-cljs.edn b/main/shadow-cljs.edn similarity index 100% rename from projects/main/shadow-cljs.edn rename to main/shadow-cljs.edn diff --git a/projects/main/shadow-cljs.sh b/main/shadow-cljs.sh similarity index 100% rename from projects/main/shadow-cljs.sh rename to main/shadow-cljs.sh diff --git a/projects/main/src/taoensso/telemere.cljc b/main/src/taoensso/telemere.cljc similarity index 100% rename from projects/main/src/taoensso/telemere.cljc rename to main/src/taoensso/telemere.cljc diff --git a/projects/main/src/taoensso/telemere/consoles.cljc b/main/src/taoensso/telemere/consoles.cljc similarity index 100% rename from projects/main/src/taoensso/telemere/consoles.cljc rename to main/src/taoensso/telemere/consoles.cljc diff --git a/projects/main/src/taoensso/telemere/files.clj b/main/src/taoensso/telemere/files.clj similarity index 100% rename from projects/main/src/taoensso/telemere/files.clj rename to main/src/taoensso/telemere/files.clj diff --git a/projects/main/src/taoensso/telemere/impl.cljc b/main/src/taoensso/telemere/impl.cljc similarity index 100% rename from projects/main/src/taoensso/telemere/impl.cljc rename to main/src/taoensso/telemere/impl.cljc diff --git a/projects/main/src/taoensso/telemere/open_telemetry.clj b/main/src/taoensso/telemere/open_telemetry.clj similarity index 100% rename from projects/main/src/taoensso/telemere/open_telemetry.clj rename to main/src/taoensso/telemere/open_telemetry.clj diff --git a/projects/main/src/taoensso/telemere/postal.clj b/main/src/taoensso/telemere/postal.clj similarity index 100% rename from projects/main/src/taoensso/telemere/postal.clj rename to main/src/taoensso/telemere/postal.clj diff --git a/projects/main/src/taoensso/telemere/slack.clj b/main/src/taoensso/telemere/slack.clj similarity index 100% rename from projects/main/src/taoensso/telemere/slack.clj rename to main/src/taoensso/telemere/slack.clj diff --git a/projects/main/src/taoensso/telemere/sockets.clj b/main/src/taoensso/telemere/sockets.clj similarity index 100% rename from projects/main/src/taoensso/telemere/sockets.clj rename to main/src/taoensso/telemere/sockets.clj diff --git a/projects/main/src/taoensso/telemere/streams.clj b/main/src/taoensso/telemere/streams.clj similarity index 100% rename from projects/main/src/taoensso/telemere/streams.clj rename to main/src/taoensso/telemere/streams.clj diff --git a/projects/main/src/taoensso/telemere/timbre.cljc b/main/src/taoensso/telemere/timbre.cljc similarity index 100% rename from projects/main/src/taoensso/telemere/timbre.cljc rename to main/src/taoensso/telemere/timbre.cljc diff --git a/projects/main/src/taoensso/telemere/tools_logging.clj b/main/src/taoensso/telemere/tools_logging.clj similarity index 100% rename from projects/main/src/taoensso/telemere/tools_logging.clj rename to main/src/taoensso/telemere/tools_logging.clj diff --git a/projects/main/src/taoensso/telemere/utils.cljc b/main/src/taoensso/telemere/utils.cljc similarity index 100% rename from projects/main/src/taoensso/telemere/utils.cljc rename to main/src/taoensso/telemere/utils.cljc diff --git a/projects/main/test/taoensso/graal_tests.clj b/main/test/taoensso/graal_tests.clj similarity index 100% rename from projects/main/test/taoensso/graal_tests.clj rename to main/test/taoensso/graal_tests.clj diff --git a/projects/main/test/taoensso/telemere_tests.cljc b/main/test/taoensso/telemere_tests.cljc similarity index 100% rename from projects/main/test/taoensso/telemere_tests.cljc rename to main/test/taoensso/telemere_tests.cljc diff --git a/projects/slf4j/.gitignore b/slf4j/.gitignore similarity index 100% rename from projects/slf4j/.gitignore rename to slf4j/.gitignore diff --git a/projects/slf4j/project.clj b/slf4j/project.clj similarity index 100% rename from projects/slf4j/project.clj rename to slf4j/project.clj diff --git a/projects/slf4j/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider b/slf4j/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider similarity index 100% rename from projects/slf4j/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider rename to slf4j/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider diff --git a/projects/slf4j/src/java/com/taoensso/telemere/slf4j/TelemereLogger.java b/slf4j/src/java/com/taoensso/telemere/slf4j/TelemereLogger.java similarity index 100% rename from projects/slf4j/src/java/com/taoensso/telemere/slf4j/TelemereLogger.java rename to slf4j/src/java/com/taoensso/telemere/slf4j/TelemereLogger.java diff --git a/projects/slf4j/src/java/com/taoensso/telemere/slf4j/TelemereLoggerFactory.java b/slf4j/src/java/com/taoensso/telemere/slf4j/TelemereLoggerFactory.java similarity index 100% rename from projects/slf4j/src/java/com/taoensso/telemere/slf4j/TelemereLoggerFactory.java rename to slf4j/src/java/com/taoensso/telemere/slf4j/TelemereLoggerFactory.java diff --git a/projects/slf4j/src/java/com/taoensso/telemere/slf4j/TelemereServiceProvider.java b/slf4j/src/java/com/taoensso/telemere/slf4j/TelemereServiceProvider.java similarity index 100% rename from projects/slf4j/src/java/com/taoensso/telemere/slf4j/TelemereServiceProvider.java rename to slf4j/src/java/com/taoensso/telemere/slf4j/TelemereServiceProvider.java diff --git a/projects/slf4j/src/taoensso/telemere/slf4j.clj b/slf4j/src/taoensso/telemere/slf4j.clj similarity index 100% rename from projects/slf4j/src/taoensso/telemere/slf4j.clj rename to slf4j/src/taoensso/telemere/slf4j.clj