Merge remote-tracking branch 'upstream/main' into issue-305-sexpr-dif…

…fers-from-read-string

* upstream/main:
  dev & ci: bump deps (clj-commons#312)
  maint: bump tools.reader (clj-commons#310)
  dev & ci: bump deps (clj-commons#309)
  publish: apply version 1.1.48
  doc: maint - contributors and used by (clj-commons#308)
  dev & ci: bump deps (clj-commons#307)

.clj-kondo/etaoin/etaoin/config.edn

@@ -12,7 +12,6 @@
    etaoin.api/with-firefox-headless  etaoin.api/with-browser
    etaoin.api/with-edge              etaoin.api/with-browser
    etaoin.api/with-edge-headless     etaoin.api/with-browser
-   etaoin.api/with-phantom           etaoin.api/with-browser
    etaoin.api/with-safari            etaoin.api/with-browser
 
    etaoin.api/with-driver            etaoin.api/with-driver
@@ -26,7 +25,6 @@
    etaoin.api2/with-edge-headless    etaoin.api2/with-browser
    etaoin.api2/with-firefox          etaoin.api2/with-browser
    etaoin.api2/with-firefox-headless etaoin.api2/with-browser
-   etaoin.api2/with-phantom          etaoin.api2/with-browser
    etaoin.api2/with-safari           etaoin.api2/with-browser}}
  :lint-as
  {etaoin.api/with-pointer-left-btn-down clojure.core/->}}

CHANGELOG.adoc

@@ -24,6 +24,11 @@ A release with known breaking changes is marked with:
 //   (adjust these in publish.clj as you see fit)
 === Unreleased
 
+* bump `org.clojure/tools.reader` to version `1.5.0`
+({lread})
+
+=== v1.1.48 - 2024-08-15 [[v1.1.48]]
+
 * bump `org.clojure/tools.reader` to version `1.4.2`
 ({lread})
 * `sexpr` now 1) expands tag metadata to its long form 2) throws on invalid metadata
@@ -40,6 +45,8 @@ A release with known breaking changes is marked with:
 ** Rewrite-clj can rewrite invalid escaped chars but will throw on `sexpr`
 {issue}295[#295] ({lread})
 
+https://github.com/clj-commons/rewrite-clj/compare/v1.1.47\...v1.1.48[commit log]
+
 === v1.1.47 - 2023-03-25 [[v1.1.47]]
 
 * Clojure string to rewrite-clj node coercion fixes

README.adoc

@@ -1,6 +1,6 @@
 :notitle:
 // num-contributors is updated automatically by doc-readme-update bb task
-:num-contributors: 56
+:num-contributors: 59
 :figure-caption!:
 :imagesdir: ./doc
 :project-src-coords: clj-commons/rewrite-clj
@@ -58,6 +58,7 @@ Some projects using rewrite-clj v1
 * https://github.com/clojure-lsp/clojure-lsp[clojure-lsp] {canary-tested} - Language Server (LSP) for Clojure
 // repo is not version tagged:
 * https://github.com/mauricioszabo/duck-repled[duck-repled] {not-canary-tested} - Transform your REPL interation into Pathom queries
+* https://github.com/jonase/kibit[kibit] {canary-tested} - There's a function for that!
 // repo is not version tagged:
 * https://github.com/kit-clj/kit[kit] {not-canary-tested} - Lightweight, modular framework for scalable web development in Clojure
 * https://github.com/FiV0/kusonga[kusonga] {canary-tested} - Renaming and moving namespaces in Clojure(script)
@@ -76,7 +77,6 @@ Some projects using rewrite-clj v0 and/or rewrite-cljs
 * https://github.com/magnars/confair[confair] {not-canary-tested} - A configuration library for Clojure
 // tests rely on datomic-pro
 * https://github.com/ivarref/gen-fn[gen-fn] {not-canary-tested} - Generate Datomic function literals from regular Clojure namespaces
-* https://github.com/jonase/kibit[kibit] {canary-tested} - There's a function for that!
 * https://github.com/xsc/lein-ancient[lein-ancient] {canary-tested} - Check your Projects for outdated Dependencies
 * https://github.com/benedekfazekas/mranderson[mranderson] {canary-tested} - Dependency inlining and shadowing
 * https://github.com/jstepien/mutant[mutant] {canary-tested} - Mutation testing for Clojure
@@ -131,27 +131,30 @@ image:AndreaCrotti.png[AndreaCrotti,role="left",width=250,link="https://github.c
 image:anmonteiro.png[anmonteiro,role="left",width=250,link="https://github.com/anmonteiro"]
 image:arrdem.png[arrdem,role="left",width=250,link="https://github.com/arrdem"]
 image:awb99.png[awb99,role="left",width=250,link="https://github.com/awb99"]
+image:bobbicodes.png[bobbicodes,role="left",width=250,link="https://github.com/bobbicodes"]
 image:brian-dawn.png[brian-dawn,role="left",width=250,link="https://github.com/brian-dawn"]
-image:BTowersCoding.png[BTowersCoding,role="left",width=250,link="https://github.com/BTowersCoding"]
 image:doby162.png[doby162,role="left",width=250,link="https://github.com/doby162"]
 image:drorbemet.png[drorbemet,role="left",width=250,link="https://github.com/drorbemet"]
 image:expez.png[expez,role="left",width=250,link="https://github.com/expez"]
 image:fazzone.png[fazzone,role="left",width=250,link="https://github.com/fazzone"]
 image:ferdinand-beyer.png[ferdinand-beyer,role="left",width=250,link="https://github.com/ferdinand-beyer"]
+image:frenchy64.png[frenchy64,role="left",width=250,link="https://github.com/frenchy64"]
 image:green-coder.png[green-coder,role="left",width=250,link="https://github.com/green-coder"]
 image:guoyongxin.png[guoyongxin,role="left",width=250,link="https://github.com/guoyongxin"]
 image:ikappaki.png[ikappaki,role="left",width=250,link="https://github.com/ikappaki"]
 image:immoh.png[immoh,role="left",width=250,link="https://github.com/immoh"]
 image:ivarref.png[ivarref,role="left",width=250,link="https://github.com/ivarref"]
 image:luxbock.png[luxbock,role="left",width=250,link="https://github.com/luxbock"]
 image:martinklepsch.png[martinklepsch,role="left",width=250,link="https://github.com/martinklepsch"]
-image:matanster.png[matanster,role="left",width=250,link="https://github.com/matanster"]
+image:matanox.png[matanox,role="left",width=250,link="https://github.com/matanox"]
 image:mhuebert.png[mhuebert,role="left",width=250,link="https://github.com/mhuebert"]
 image:mikekap.png[mikekap,role="left",width=250,link="https://github.com/mikekap"]
 image:mjayprateek.png[mjayprateek,role="left",width=250,link="https://github.com/mjayprateek"]
+image:mrkam2.png[mrkam2,role="left",width=250,link="https://github.com/mrkam2"]
 image:msgodf.png[msgodf,role="left",width=250,link="https://github.com/msgodf"]
 image:mynomoto.png[mynomoto,role="left",width=250,link="https://github.com/mynomoto"]
 image:optevo.png[optevo,role="left",width=250,link="https://github.com/optevo"]
+image:p4ulcristian.png[p4ulcristian,role="left",width=250,link="https://github.com/p4ulcristian"]
 image:rfhayashi.png[rfhayashi,role="left",width=250,link="https://github.com/rfhayashi"]
 image:rgkirch.png[rgkirch,role="left",width=250,link="https://github.com/rgkirch"]
 image:RickMoynihan.png[RickMoynihan,role="left",width=250,link="https://github.com/RickMoynihan"]

bb.edn

@@ -4,10 +4,10 @@
         io.aviso/pretty {:mvn/version "1.4.4"}
         dev.nubank/docopt {:mvn/version "0.6.1-fix7"}
         doric/doric {:mvn/version "0.9.0"}
-        version-clj/version-clj {:mvn/version "2.0.2"}
+        version-clj/version-clj {:mvn/version "2.0.3"}
         lread/status-line {:git/url "https://github.com/lread/status-line.git"
                            :sha "cf44c15f30ea3867227fa61ceb823e5e942c707f"}
-        etaoin/etaoin {:mvn/version "1.0.40"}
+        etaoin/etaoin {:mvn/version "1.1.41"}
         io.github.babashka/neil {:git/tag "v0.3.67" :git/sha "054ca51"}}
  :tasks {;; setup
          :requires ([clojure.string :as string]

deps.edn

@@ -1,11 +1,11 @@
 {:paths ["src" "resources"]
 
  :deps {org.clojure/clojure {:mvn/version "1.8.0"}
-        org.clojure/tools.reader {:mvn/version "1.4.2"}}
+        org.clojure/tools.reader {:mvn/version "1.5.0"}}
 
  :aliases {;; we use babashka/neil for project attributes
            ;; publish workflow references these values (and automatically bumps patch component of version)
-           :neil {:project {:version "1.1.47" ;; describes last release and is template for next release
+           :neil {:project {:version "1.1.48" ;; describes last release and is template for next release
                             :name rewrite-clj/rewrite-clj
                             ;; not neilisms - could potentially conflict with new neilisms
                             :github-coords clj-commons/rewrite-clj}}
@@ -16,10 +16,8 @@
            :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.3"}}}
-           :1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.3"}}}
-
-           ;; Clojure pre-release to test against
-           :1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.0-beta2"}}}
+           :1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.4"}}}
+           :1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.0"}}}
 
            ;;
            ;; ClojureScript version we test with (and support)
@@ -30,8 +28,8 @@
            ;; REPL to support bb dev-jvm & dev-cljs tasks, see script/dev_repl.clj
            ;;
            :nrepl
-           {:extra-deps {nrepl/nrepl {:mvn/version "1.2.0"}
-                         cider/cider-nrepl {:mvn/version "0.49.2"}}
+           {:extra-deps {nrepl/nrepl {:mvn/version "1.3.0"}
+                         cider/cider-nrepl {:mvn/version "0.50.2"}}
             :jvm-opts ["-XX:-OmitStackTraceInFastThrow"]}
 
            :nrepl/jvm
@@ -52,8 +50,8 @@
            ;;
            :lint-cache {:replace-paths ["src"]} ;; when building classpath we want to exclude resources
                                                 ;; so we do not pick up our own clj-kondo config exports
-           :clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2024.08.01"}}
-                       :override-deps {org.clojure/clojure {:mvn/version "1.11.3"}}
+           :clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2024.08.29"}}
+                       :override-deps {org.clojure/clojure {:mvn/version "1.11.4"}}
                        :main-opts ["-m" "clj-kondo.main"]}
 
            :eastwood {:extra-deps {jonase/eastwood {:mvn/version "1.4.3"}}
@@ -76,7 +74,7 @@
            :test-isolated {:extra-paths ["test-isolated"]}
 
            ;; document block testing
-           :test-doc-blocks {:replace-deps {org.clojure/clojure {:mvn/version "1.11.3"}
+           :test-doc-blocks {:replace-deps {org.clojure/clojure {:mvn/version "1.11.4"}
                                             com.github.lread/test-doc-blocks  {:mvn/version "1.1.20"}}
                              :replace-paths []
                              :ns-default lread.test-doc-blocks
@@ -85,7 +83,7 @@
                                                 "doc/design/namespaced-elements.adoc"
                                                 "src/rewrite_clj/node.cljc"]}}
 
-           :test-docs {:override-deps {org.clojure/clojure {:mvn/version "1.11.3"}}
+           :test-docs {:override-deps {org.clojure/clojure {:mvn/version "1.11.4"}}
                        :extra-paths ["target/test-doc-blocks/test"]}
 
            ;; kaocha for testing clojure versions>= v1.9
@@ -102,7 +100,7 @@
 
            ;; figwheel for clojurescript testing during dev
            :fig-test {:extra-deps {com.bhauman/figwheel-main {:mvn/version "0.2.18"}}
-                      :override-deps {org.clojure/clojure {:mvn/version "1.11.3"}}
+                      :override-deps {org.clojure/clojure {:mvn/version "1.11.4"}}
                       :extra-paths ["target" "test"]
                       :main-opts ["-m" "figwheel.main" "-b" "fig" "-r"]}
 
@@ -117,12 +115,12 @@
            ;; General script deps
            ;;
            :script {:extra-paths ["script"]
-                    :override-deps {org.clojure/clojure {:mvn/version "1.11.3"}}
+                    :override-deps {org.clojure/clojure {:mvn/version "1.11.4"}}
                     :extra-deps {org.clojure/tools.namespace {:mvn/version "1.5.0"}
                                  cli-matic/cli-matic {:mvn/version "0.5.4"}}}
 
-           :apply-import-vars {:override-deps {org.clojure/clojure {:mvn/version "1.11.3"}}
-                               :extra-deps {metosin/malli {:mvn/version "0.16.2"}
+           :apply-import-vars {:override-deps {org.clojure/clojure {:mvn/version "1.11.4"}}
+                               :extra-deps {metosin/malli {:mvn/version "0.16.4"}
                                             io.aviso/pretty {:mvn/version "1.4.4"}}
                                :ns-default lread.apply-import-vars}
 
@@ -133,7 +131,7 @@
            ;; graal:sci-test - interpret tests via sci over natively compiled rewrite-clj
            ;; graal:native-test - natively compile src and tests and run
 
-           :graal {:override-deps {org.clojure/clojure {:mvn/version "1.11.3"}}
+           :graal {:override-deps {org.clojure/clojure {:mvn/version "1.11.4"}}
                    :extra-deps {com.github.clj-easy/graal-build-time {:mvn/version "1.0.5"}}}
 
 
@@ -160,8 +158,8 @@
            ;;
            ;; Maintenance support
            ;;
-           :outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.8.1206"}
-                                   org.slf4j/slf4j-simple {:mvn/version "2.0.13"} ;; to rid ourselves of logger warnings
+           :outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.9.1221"}
+                                   org.slf4j/slf4j-simple {:mvn/version "2.0.16"} ;; to rid ourselves of logger warnings
                                    }
                       :override-deps {org.clojure/clojure {:mvn/version "1.11.1"}}
                       :main-opts ["-m" "antq.core"

doc/01-user-guide.adoc

@@ -5,7 +5,7 @@
 :toclevels: 5
 :toc:
 // DO NOT EDIT: the lib-version parameter is automatically updated by bb publish
-:lib-version: 1.1.47
+:lib-version: 1.1.48
 
 == Introduction
 Rewrite-clj is a library that can read, update and write Clojure, ClojureScript and https://github.com/edn-format/edn[EDN] source code while preserving whitespace and comments.

doc/contributors.edn

@@ -66,7 +66,7 @@
    :contributions [:issue]}
   {:github-id "immoh"
    :contributions [:issue]}
-  {:github-id "matanster"
+  {:github-id "matanox"
    :contributions [:issue]}
   {:github-id "SevereOverfl0w"
    :contributions [:issue]}
@@ -102,8 +102,14 @@
    :contributions [:code-rewrite-clj-v1]}
   {:github-id "ikappaki"
    :contributions [:issue]}
-  {:github-id "BTowersCoding"
-   :contributions [:doc]}]
+  {:github-id "bobbicodes"
+   :contributions [:doc]}
+  {:github-id "p4ulcristian"
+   :contributions [:issue]}
+  {:github-id "mrkam2"
+   :contributions [:issue]}
+  {:github-id "frenchy64"
+   :contributions [:issue]}]
  :founders
  [{:github-id "xsc"
    :contributions [:original-author :doc :design :issue :review :support :code-rewrite-clj-v0]}

package.json

@@ -6,6 +6,6 @@
     "karma-cljs-test": "^0.1.0",
     "karma-junit-reporter": "^2.0.0",
     "karma-spec-reporter": "^0.0.36",
-    "shadow-cljs": "^2.28.11"
+    "shadow-cljs": "^2.28.14"
   }
 }

script/test_libs.clj

@@ -157,7 +157,7 @@
  (patch-deps {:filename (str (fs/file home-dir "project.clj"))
               ;; we remove and add tools.reader because project.clj has pedantic? :abort enabled
               :removals #{'rewrite-clj 'org.clojure/tools.reader}
-              :additions [['org.clojure/tools.reader "1.4.2"]
+              :additions [['org.clojure/tools.reader "1.5.0"]
                           ['rewrite-clj rewrite-clj-version]]}))
 
 ;;
@@ -193,7 +193,7 @@
         (string/replace #"rewrite-clj \"(\d+\.)+.*\""
                         (format "rewrite-clj \"%s\"" rewrite-clj-version))
         (string/replace #"org.clojure/tools.reader \"(\d+\.)+.*\""
-                        "org.clojure/tools.reader \"1.4.2\"")
+                        "org.clojure/tools.reader \"1.5.0\"")
         (->> (spit p)))))
 
 ;;
@@ -227,7 +227,7 @@
                         (format "rewrite-clj \"%s\"" rewrite-clj-version))
         ;; pedantic is enabled for CI, so adjust to match rewrite-clj so we don't fail
         (string/replace #"org.clojure/tools.reader \"(\d+\.)+.*\""
-                        "org.clojure/tools.reader \"1.4.2\"")
+                        "org.clojure/tools.reader \"1.5.0\"")
         (->> (spit p)))))
 
 ;;
@@ -283,7 +283,7 @@
             :show-deps-fn lein-deps-tree
             :test-cmds ["lein kaocha"]}
            {:name "antq"
-            :version "2.8.1201"
+            :version "2.9.1221"
             :platforms [:clj]
             :github-release {:repo "liquidz/antq"}
             :patch-fn deps-edn-v1-patch
@@ -334,7 +334,7 @@
                         "bin/test unit"]}
            {:name "clojure-lsp"
             :platforms [:clj]
-            :version "2024.04.22-11.50.26"
+            :version "2024.08.05-18.16.00"
             :github-release {:repo "clojure-lsp/clojure-lsp"}
             :patch-fn clojure-lsp-patch
             :show-deps-fn clojure-lsp-deps