From 97868812c18ce56e5ab0394ea2d35d74e7914efa Mon Sep 17 00:00:00 2001
From: Sean Corfield <sean@corfield.org>
Date: Fri, 6 Mar 2020 15:11:44 -0800
Subject: [PATCH] Prepare to switch from lein to CLI/deps.edn

This starts the cleanup of the project so I can use cljs-test-runner via
the CLI. The next big cleanup will be removing macrovich.
---
 .gitignore                                       |  1 +
 deps.edn                                         | 16 ++++++++++------
 project.clj                                      |  4 ++--
 .../honeysql/self_host_runner.cljs               |  0
 {test => test-lein}/honeysql/test.cljs           |  0
 5 files changed, 13 insertions(+), 8 deletions(-)
 rename {test => test-lein}/honeysql/self_host_runner.cljs (100%)
 rename {test => test-lein}/honeysql/test.cljs (100%)

diff --git a/.gitignore b/.gitignore
index ef6ee9c..d8cc524 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,5 @@ pom.xml*
 .nrepl-port
 bin
 test/readme.clj
+/cljs-test-runner-out
 /node_modules
diff --git a/deps.edn b/deps.edn
index 36fa1af..98de22c 100644
--- a/deps.edn
+++ b/deps.edn
@@ -1,16 +1,20 @@
-;; A basic deps.edn for HoneySQL
-;; Only supports the Clojure (.cljc) side of the house.
-;; Provides basic support for running the tests (in Clojure).
 {:paths ["src" "resources"]
  :deps {org.clojure/clojure {:mvn/version "1.10.1"}
         net.cgrand/macrovich {:mvn/version "0.2.1"}}
  :aliases
- {;; clj -A:test:runner
+ {:1.7 {:override-deps {org.clojure/clojure {:mvn/version "1.7.0"}}}
+  :1.8 {:override-deps {org.clojure/clojure {:mvn/version "1.8.0"}}}
+  :1.9 {:override-deps {org.clojure/clojure {:mvn/version "1.9.0"}}}
+  :1.10 {:override-deps {org.clojure/clojure {:mvn/version "1.10.1"}}}
+  :master {:override-deps {org.clojure/clojure {:mvn/version "1.11.0-master-SNAPSHOT"}}}
+  ;; clj -A:test:runner
   :test {:extra-paths ["test"]}
   :runner {:extra-deps {com.cognitect/test-runner
                         {:git/url "https://github.com/cognitect-labs/test-runner"
-                         :sha "76568540e7f40268ad2b646110f237a60295fa3c"}}
+                         :sha "f7ef16dc3b8332b0d77bc0274578ad5270fbfedd"}}
            :main-opts ["-m" "cognitect.test-runner"
                        "-d" "test"]}
-  :readme {:extra-deps {seancorfield/readme {:mvn/version "1.0.8"}}
+  :cljs-runner {:extra-deps {olical/cljs-test-runner {:mvn/version "3.7.0"}}
+                :main-opts ["-m" "cljs-test-runner.main"]}
+  :readme {:extra-deps {seancorfield/readme {:mvn/version "1.0.12"}}
            :main-opts ["-m" "seancorfield.readme"]}}}
diff --git a/project.clj b/project.clj
index 14ee017..60b82d4 100644
--- a/project.clj
+++ b/project.clj
@@ -17,7 +17,7 @@
                                             :output-wrapper false
                                             :parallel-build true
                                             :pretty-print false}}
-                       :test {:source-paths ["src" "test"]
+                       :test {:source-paths ["src" "test" "test-lein"]
                               :compiler {:output-to "target/test/honeysql.js"
                                          :output-dir "target/test"
                                          :source-map true
@@ -26,7 +26,7 @@
                                          :target :nodejs}}}}
   :doo {:build "test"}
   :tach {:test-runner-ns 'honeysql.self-host-runner
-         :source-paths ["src" "test"]}
+         :source-paths ["src" "test" "test-lein"]}
   :profiles {:midje {:dependencies [[midje "1.9.6"]]
                      :plugins      [[lein-midje "3.2.1"]
                                     [midje-readme "1.0.9"]]
diff --git a/test/honeysql/self_host_runner.cljs b/test-lein/honeysql/self_host_runner.cljs
similarity index 100%
rename from test/honeysql/self_host_runner.cljs
rename to test-lein/honeysql/self_host_runner.cljs
diff --git a/test/honeysql/test.cljs b/test-lein/honeysql/test.cljs
similarity index 100%
rename from test/honeysql/test.cljs
rename to test-lein/honeysql/test.cljs