dev: libs tests takes advantage of bb 0.3.2

Babashka 0.3.2 now has built in support for rewrite-clj!
We take advantage of this in libs_tests.clj.

Author: lread

deps.edn

@@ -96,7 +96,7 @@
 
            ;;
            ;; Deployment
-           ;; 
+           ;;
            :jar {:replace-deps {com.github.seancorfield/depstar {:mvn/version "2.0.206"}}
                  :exec-fn hf.depstar/jar
                  :exec-args {:jar "target/rewrite-clj.jar"
@@ -119,12 +119,5 @@
            :outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "0.12.2"}
                                    org.slf4j/slf4j-simple {:mvn/version "1.7.30"} ;; to rid ourselves of logger warnings
                                    }
-                      :main-opts ["-m" "antq.core"]}
-
-           ;;
-           ;; 3rd party lib testing support
-           ;;
-
-           :deps-patcher {:extra-paths ["script"]
-                          :ns-default lread.deps-patcher}}}
+                      :main-opts ["-m" "antq.core"]}}}
 

doc/02-developer-guide.adoc

@@ -21,7 +21,7 @@ On Windows we only test against JDK11 as tool setup for JDK8 on Windows seemed o
 * NodeJs v12 or above
 * Clojure v1.10.1.697 or above for `clojure` command
 ** Note that rewrite-clj v1 itself supports Clojure v1.9 and above
-* Babashka v0.3.1 or above
+* Babashka v0.3.2 or above
 * GraalVM v21.0.0 (if you want to run GraalVM native image tests)
 
 === Windows Notes

script/lread/deps_patcher.clj renamed to script/helper/deps_patcher.clj

@@ -1,5 +1,4 @@
-;; Called with clojure in support of libs tests
-(ns lread.deps-patcher
+(ns helper.deps-patcher
   "Quick and dirty little project.clj and deps.edn patcher"
   (:require [rewrite-clj.zip :as z]))
 

script/libs_tests.clj

@@ -10,6 +10,7 @@
             [docopt.core :as docopt]
             [docopt.match :as docopt-match]
             [doric.core :as doric]
+            [helper.deps-patcher :as deps-patcher]
             [helper.env :as env]
             [helper.shell :as shell]
             [helper.status :as status]
@@ -131,24 +132,19 @@
                     (spit f new-content))))
               (fs/glob home-dir "**/*.{clj,cljc,cljs}"))))
 
-(defn- patch-deps [{:keys [filename removals additions]}]
+(defn- patch-deps [{:keys [filename] :as opts}]
   (status/line :detail (format "=> Patching deps in: %s" filename))
-  (shcmd ["clojure" "-X:deps-patcher"
-                  (if (string/ends-with? filename "deps.edn")
-                    "update-deps-deps"
-                    "update-project-deps")
-                  :filename (pr-str filename)
-                  :removals (str removals)
-                  :additions (str additions)]))
+  (if (string/ends-with? filename "deps.edn")
+    (deps-patcher/update-deps-deps opts)
+    (deps-patcher/update-project-deps opts)))
 
 ;;
-;; Generic patch for deps.edn rewrite-clj v1 projects
+;; Generic patch for deps.edn rewrite-clj v1 projects to v1 current
 ;;
 (defn deps-edn-v1-patch [{:keys [home-dir rewrite-clj-version]}]
   (patch-deps {:filename (str (fs/file home-dir "deps.edn"))
                :removals #{'rewrite-clj 'rewrite-clj/rewrite-clj}
-               :additions {'rewrite-clj/rewrite-clj {:mvn/version rewrite-clj-version}}})
-  (patch-rewrite-cljc-sources home-dir))
+               :additions {'rewrite-clj/rewrite-clj {:mvn/version rewrite-clj-version}}}))
 
 (defn- replace-in-file [fname match replacement]
   (let [orig-filename (str fname ".orig")