From b9708e825f3b066f8d6df14935494b21b70bdd88 Mon Sep 17 00:00:00 2001
From: Sean Corfield <sean@corfield.org>
Date: Fri, 27 Aug 2021 22:51:55 -0700
Subject: [PATCH] Switch to build-clj lib

---
 build.clj | 62 +++++++------------------------------------------------
 deps.edn  | 10 +++------
 2 files changed, 11 insertions(+), 61 deletions(-)

diff --git a/build.clj b/build.clj
index 832c7c8..6206843 100644
--- a/build.clj
+++ b/build.clj
@@ -9,69 +9,23 @@
 
   clojure -A:deps -T:build help/doc"
   (:require [clojure.tools.build.api :as b]
-            [clojure.tools.deps.alpha :as t]
-            [deps-deploy.deps-deploy :as dd]))
+            [org.corfield.build :as bb]))
 
 (def lib 'com.github.seancorfield/next.jdbc)
 (def version (format "1.2.%s" (b/git-count-revs nil)))
-(def class-dir "target/classes")
-(def basis (b/create-basis {:project "deps.edn"}))
-(def jar-file (format "target/%s-%s.jar" (name lib) version))
-
-(defn clean "Remove the target folder." [_]
-  (println "\nCleaning target...")
-  (b/delete {:path "target"}))
-
-(defn jar "Build the library JAR file." [_]
-  (println "\nWriting pom.xml...")
-  (b/write-pom {:class-dir class-dir
-                :lib lib
-                :version version
-                :scm {:tag (str "v" version)}
-                :basis basis
-                :src-dirs ["src"]})
-  (println "Copying src...")
-  (b/copy-dir {:src-dirs ["src"]
-               :target-dir class-dir})
-  (println (str "Building jar " jar-file "..."))
-  (b/jar {:class-dir class-dir
-          :jar-file jar-file}))
-
-(defn- run-task
-  [aliases]
-  (println "\nRunning task for:" aliases)
-  (let [basis    (b/create-basis {:aliases aliases})
-        combined (t/combine-aliases basis aliases)
-        cmds     (b/java-command {:basis     basis
-                                  :java-opts (:jvm-opts combined)
-                                  :main      'clojure.main
-                                  :main-args (:main-opts combined)})
-        {:keys [exit]} (b/process cmds)]
-    (when-not (zero? exit)
-      (throw (ex-info (str "Task failed for: " aliases) {})))))
-
-
-(defn run-tests
-  "Run regular tests.
-
-  Optionally specify :aliases:
-  [:1.10] -- test against Clojure 1.10.3 (the default)
-  [:master] -- test against Clojure 1.11 master snapshot"
-  [{:keys [aliases] :as opts}]
-  (run-task (into [:test] aliases))
-  opts)
 
 (defn ci "Run the CI pipeline of tests (and build the JAR)." [opts]
   (-> opts
+      (assoc :lib lib :version version)
       (as-> opts
             (reduce (fn [opts alias]
-                      (run-tests (assoc opts :aliases [alias :runner])))
+                      (bb/run-tests (assoc opts :aliases [alias])))
                     opts
                     [:1.10 :master]))
-      (clean)
-      (jar)))
+      (bb/clean)
+      (bb/jar)))
 
 (defn deploy "Deploy the JAR to Clojars." [opts]
-  (dd/deploy (merge {:installer :remote :artifact jar-file
-                     :pom-file (b/pom-path {:lib lib :class-dir class-dir})}
-                    opts)))
+  (-> opts
+      (assoc :lib lib :version version)
+      (bb/deploy)))
diff --git a/deps.edn b/deps.edn
index 2d76e06..2819216 100644
--- a/deps.edn
+++ b/deps.edn
@@ -6,8 +6,8 @@
         camel-snake-kebab/camel-snake-kebab {:mvn/version "0.4.2"}}
  :aliases
  {;; for help: clojure -A:deps -T:build help/doc
-  :build {:deps {io.github.clojure/tools.build {:git/tag "v0.1.9" :git/sha "6736c83"}
-                 io.github.slipset/deps-deploy {:sha "b4359c5d67ca002d9ed0c4b41b710d7e5a82e3bf"}}
+  :build {:deps {io.github.seancorfield/build-clj
+                 {:git/tag "v0.1.0" :git/sha "fe2d586"}}
           :ns-default build}
 
   ;; versions to test against:
@@ -49,8 +49,4 @@
                       org.apache.logging.log4j/log4j-jul {:mvn/version "2.14.1"}
                       org.apache.logging.log4j/log4j-slf4j-impl {:mvn/version "2.14.1"}}
          :jvm-opts ["-Dlog4j2.configurationFile=log4j2-info.properties"]
-         :exec-fn cognitect.test-runner.api/test}
-
-  ;; various "runners" for tests/CI:
-  :runner
-  {:main-opts ["-m" "cognitect.test-runner"]}}}
+         :exec-fn cognitect.test-runner.api/test}}}