diff --git a/.gitignore b/.gitignore index 6e24ab4..8357fa3 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ .settings .socket-repl-port .sw* +.vscode *.class *.jar *.swp diff --git a/build.clj b/build.clj index 3959056..3473fbe 100644 --- a/build.clj +++ b/build.clj @@ -1,5 +1,6 @@ (ns build - (:require [clojure.tools.build.api :as b])) + (:require [clojure.tools.build.api :as b] + [clojure.tools.deps.alpha :as t])) (def lib 'com.github.seancorfield/next.jdbc) (def version (format "1.2.%s" (b/git-count-revs nil))) @@ -8,11 +9,11 @@ (def jar-file (format "target/%s-%s.jar" (name lib) version)) (defn clean [_] - (println "Cleaning target...") + (println "\nCleaning target...") (b/delete {:path "target"})) (defn jar [_] - (println "Writing pom.xml...") + (println "\nWriting pom.xml...") (b/write-pom {:class-dir class-dir :lib lib :version version @@ -27,10 +28,12 @@ (defn run-tests [_] - (let [basis (b/create-basis {:aliases [:test]}) - cmds (b/java-command {:basis basis - :main 'clojure.main - :main-args ["-m" "cognitect.test-runner"]}) + (let [basis (b/create-basis {:aliases [:test]}) + combined (t/combine-aliases basis [:test]) + cmds (b/java-command {:basis basis + :java-opts (:jvm-opts combined) + :main 'clojure.main + :main-args ["-m" "cognitect.test-runner"]}) {:keys [exit]} (b/process cmds)] (when-not (zero? exit) (throw (ex-info "Tests failed" {}))))) diff --git a/pom.xml b/pom.xml index e72c40f..308c59f 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,6 @@ https://github.com/seancorfield/next-jdbc scm:git:git://github.com/seancorfield/next-jdbc.git scm:git:ssh://git@github.com/seancorfield/next-jdbc.git - v1.2.689