From 417e9e29ffcfcecb42ab8779072011ae95905cbf Mon Sep 17 00:00:00 2001 From: gered Date: Wed, 22 Dec 2021 18:24:02 -0500 Subject: [PATCH] fix up project profiles a bit and adjust some build settings separate out the uberjar profile so that the bits that control the classpath are in a separate profile (now called "release") which can be more easily brought in separately during development to test, without being forced to build an uberjar to test remove the uberjar alias, which only was added because i did not realize that leiningen by default automatically does a clean before building a jar (???) --- .../leiningen/new/simple_app/project.clj | 24 +++++++++++-------- src/leiningen/new/simple_app.clj | 4 ++-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/resources/leiningen/new/simple_app/project.clj b/resources/leiningen/new/simple_app/project.clj index f25a33c..d369172 100644 --- a/resources/leiningen/new/simple_app/project.clj +++ b/resources/leiningen/new/simple_app/project.clj @@ -15,16 +15,20 @@ :main {{root-ns}}.core :repl-options {:init-ns {{root-ns}}.core} + :target-path "target/%s/" - :profiles {:dev {:source-paths ["env/dev/src"] - :resource-paths ["env/dev/resources"] - :dependencies [[pjstadig/humane-test-output "0.11.0"]] - :injections [(require 'pjstadig.humane-test-output) - (pjstadig.humane-test-output/activate!)]} + :profiles {:dev {:source-paths ["env/dev/src"] + :resource-paths ["env/dev/resources"] + :dependencies [[pjstadig/humane-test-output "0.11.0"]] + :injections [(require 'pjstadig.humane-test-output) + (pjstadig.humane-test-output/activate!)]} - :uberjar {:source-paths ["env/prod/src"] - :resource-paths ["env/prod/resources"] - :omit-source true - :aot :all}} + :release {:source-paths ["env/release/src"] + :resource-paths ["env/release/resources"]} - :aliases {"uberjar" ["do" ["clean"] ["uberjar"]]}) + :release/uberjar {:omit-source true + :aot :all} + + :uberjar [:release :release/uberjar]} + + ) diff --git a/src/leiningen/new/simple_app.clj b/src/leiningen/new/simple_app.clj index b5e3bcf..9ab030f 100644 --- a/src/leiningen/new/simple_app.clj +++ b/src/leiningen/new/simple_app.clj @@ -16,8 +16,8 @@ data "env/dev/resources" "env/dev/src" - "env/prod/resources" - "env/prod/src" + "env/release/resources" + "env/release/src" ["resources/logback.xml" (render "resources/logback.xml" data)] ["src/{{root-ns-path}}/core.clj" (render "src/root_ns/core.clj" data)] ["test/{{root-ns-path}}/core_test.clj" (render "test/root_ns/core_test.clj" data)]