From fd1f8c50e81140de0748a4e41f58c87c11451f5e Mon Sep 17 00:00:00 2001 From: lread Date: Tue, 11 Mar 2025 08:28:22 -0400 Subject: [PATCH 1/2] Bump clojure/tools.reader to v1.5.2 We always bump to current to make sure we work with current. This latest version fixes metadata for numbers at end of content (which rewrite-clj was unnaffected by). --- CHANGELOG.adoc | 2 +- deps.edn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index e3dd4cd2..798836ee 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -26,7 +26,7 @@ A release with known breaking changes is marked with: * `rewrite-clj.zip/insert-right` and `rewrite-clj.zip/append-child` no longer insert a space when inserting/appending after a comment node. {issue}346[#346] ({lread}) -* `:end-col` metadata now correct for keywords at end of content +* bump `clojure/tools.reader` to correct `:end-col` metadata for keywords at end of content {issue}367[#367] ({lread}) * `rewrite.clj.paredit` ** now supports paredit ops on new/changed nodes in a zipper diff --git a/deps.edn b/deps.edn index 13c8516a..87f0aa0e 100644 --- a/deps.edn +++ b/deps.edn @@ -1,7 +1,7 @@ {:paths ["src" "resources"] :deps {org.clojure/clojure {:mvn/version "1.8.0"} - org.clojure/tools.reader {:mvn/version "1.5.1"}} + org.clojure/tools.reader {:mvn/version "1.5.2"}} :aliases {;; we use babashka/neil for project attributes ;; publish workflow references these values (and automatically bumps patch component of version) From 7e23cc49bfe32f3e0d870758da9f04dd67371790 Mon Sep 17 00:00:00 2001 From: lread Date: Tue, 11 Mar 2025 08:40:02 -0400 Subject: [PATCH 2/2] lib tests: adjust for pedantic libs Pedantic libs need a tweak when bumping tools.reader. --- script/test_libs.clj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/test_libs.clj b/script/test_libs.clj index 4321fafb..6b5a7a36 100755 --- a/script/test_libs.clj +++ b/script/test_libs.clj @@ -158,7 +158,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.5.1"] + :additions [['org.clojure/tools.reader "1.5.2"] ['rewrite-clj rewrite-clj-version]]})) ;; @@ -194,7 +194,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.5.1\"") + "org.clojure/tools.reader \"1.5.2\"") (->> (spit p))))) ;; @@ -228,7 +228,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.5.1\"") + "org.clojure/tools.reader \"1.5.2\"") (->> (spit p))))) ;;