diff --git a/build/build.clj b/build/build.clj index 139e1ea..cffde7a 100644 --- a/build/build.clj +++ b/build/build.clj @@ -1,8 +1,23 @@ (ns build - (:require - [org.corfield.build :as bb])) + (:require [clojure.tools.build.api :as b])) + +(def class-dir "target/classes") +(def uber-file "target/doplarr.jar") + +;; delay to defer side effects (artifact downloads) +(def basis (delay (b/create-basis {:project "deps.edn"}))) + +(defn clean [_] + (b/delete {:path "target"})) (defn uber [_] - (bb/clean nil) - (bb/uber {:uber-file "target/doplarr.jar" - :main 'doplarr.core})) + (clean nil) + (b/copy-dir {:src-dirs ["src" "resources"] + :target-dir class-dir}) + (b/compile-clj {:basis @basis + :ns-compile '[doplarr.core] + :class-dir class-dir}) + (b/uber {:class-dir class-dir + :uber-file uber-file + :basis @basis + :main 'doplarr.core})) diff --git a/deps.edn b/deps.edn index fcbf49a..1f6c627 100644 --- a/deps.edn +++ b/deps.edn @@ -1,6 +1,6 @@ {:paths ["src" "resources"] - :deps {org.clojure/clojure {:mvn/version "1.11.1"} + :deps {org.clojure/clojure {:mvn/version "1.12.4"} io.aviso/pretty {:mvn/version "1.1.1"} org.clojure/core.cache {:mvn/version "1.0.225"} yogthos/config {:mvn/version "1.2.0"} @@ -15,9 +15,6 @@ com.taoensso/timbre {:mvn/version "5.2.1"} camel-snake-kebab/camel-snake-kebab {:mvn/version "0.4.3"}} - :jvm-opts ["-Dconfig=config.edn"] - :aliases {:build {:extra-paths ["build"] - :deps {io.github.seancorfield/build-clj - {:git/tag "v0.8.3" :git/sha "7ac1f8d"}} + :deps {io.github.clojure/tools.build {:git/tag "v0.10.11" :git/sha "c6c670a"}} :ns-default build}}}