From 0147195e8cfd32323215c0b85ce61de2b9c673e8 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Fri, 6 Sep 2024 14:37:00 +0200
Subject: [PATCH] Clojure 1.12 (#1718)

---
 deps.edn                     | 2 +-
 fs                           | 2 +-
 project.clj                  | 2 +-
 test/babashka/error_test.clj | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/deps.edn b/deps.edn
index 2f3a49c4..6efcc2d1 100644
--- a/deps.edn
+++ b/deps.edn
@@ -18,7 +18,7 @@
          "deps.clj/src" "deps.clj/resources"
          "resources" "sci/resources"
          "impl-java/src"],
- :deps {org.clojure/clojure {:mvn/version "1.11.2"},
+ :deps {org.clojure/clojure {:mvn/version "1.12.0"},
         org.babashka/sci {:local/root "sci"}
         org.babashka/babashka.impl.java {:mvn/version "0.1.8"}
         org.babashka/sci.impl.types {:mvn/version "0.0.2"}
diff --git a/fs b/fs
index 11121ded..99d6a3b2 160000
--- a/fs
+++ b/fs
@@ -1 +1 @@
-Subproject commit 11121dedba416e93ce1eb69674c78f269a1f3e0a
+Subproject commit 99d6a3b2f55b851a6949ed6eee31412b299dcf01
diff --git a/project.clj b/project.clj
index 052ebdb2..bc8a5e7e 100644
--- a/project.clj
+++ b/project.clj
@@ -21,7 +21,7 @@
                    :non-flaky (complement :flaky)
                    :flaky :flaky}
   :jvm-opts ["--enable-preview"]
-  :dependencies [[org.clojure/clojure "1.11.2"]
+  :dependencies [[org.clojure/clojure "1.12.0"]
                  [borkdude/edamame "1.4.27"]
                  [borkdude/graal.locking "0.0.2"]
                  [org.clojure/tools.cli "1.0.214"]
diff --git a/test/babashka/error_test.clj b/test/babashka/error_test.clj
index e79967b3..d3230f75 100644
--- a/test/babashka/error_test.clj
+++ b/test/babashka/error_test.clj
@@ -11,7 +11,8 @@
   (-> line str/trimr
       ;; take into account JDK14+ and native image differences
       (str/replace "class clojure.lang" "clojure.lang")
-      (str/replace #" \(.*\)$" "")))
+      (str/replace #" \(.*\)$" "")
+      (str/replace #"--\d\d\d\d" "")))
 
 (defmacro multiline-equals [s1 s2]
   `(let [lines-s1# (str/split-lines ~s1)