diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5f35f824..e0944667 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,7 +80,7 @@ jobs: BABASHKA_VERSION=$(cat resources/BABASHKA_VERSION) echo "##[set-output name=version;]${BABASHKA_VERSION}" - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 with: name: babashka-${{ steps.babashka-version.outputs.version }}-standalone.jar path: target/babashka-${{ steps.babashka-version.outputs.version }}-standalone.jar @@ -182,14 +182,14 @@ jobs: run: .circleci/script/release - name: Upload artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: path: bb name: babashka-${{ steps.babashka-version.outputs.version }}-${{ matrix.name }}-amd64 - name: Upload static artifact if: "matrix.static == true" - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: path: bb name: babashka-${{ steps.babashka-version.outputs.version }}-${{ matrix.name }}-static-amd64 diff --git a/CHANGELOG.md b/CHANGELOG.md index 420d6bc8..ebb6dfed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,13 +10,16 @@ A preview of the next release can be installed from ## Unreleased - Upgrade Clojure to `1.12.0` -- [#1720](https://github.com/babashka/babashka/issues/1720): Include `clojure.java.process` +- Fix [#1722](https://github.com/babashka/babashka/issues/1722): add new clojure 1.12 vars +- [#1720](https://github.com/babashka/babashka/issues/1720): Include new clojure 1.12's `clojure.java.process` - [#1598](https://github.com/babashka/babashka/issues/1598): use Rosetta on CircleCI to build x64 images - Bump SCI - Bump `fs` - Bump `process` - Bump `deps.clj` - Bump `http-client` +- Bump `clj-yaml` +- Bump `edamame` - Add `java.io.LineNumberReader` ## 1.3.191 (2024-06-19) diff --git a/deps.clj b/deps.clj index 42dae400..4fd62578 160000 --- a/deps.clj +++ b/deps.clj @@ -1 +1 @@ -Subproject commit 42dae4007337ca9d31b4df83b652b03de8e09b7b +Subproject commit 4fd62578e215b7341dd6c818259e47c461949573 diff --git a/deps.edn b/deps.edn index 6efcc2d1..82ba2a18 100644 --- a/deps.edn +++ b/deps.edn @@ -31,7 +31,7 @@ org.clojure/data.csv {:mvn/version "1.0.0"}, cheshire/cheshire {:mvn/version "5.13.0"} org.clojure/data.xml {:mvn/version "0.2.0-alpha8"} - clj-commons/clj-yaml {:mvn/version "1.0.27"} + clj-commons/clj-yaml {:mvn/version "1.0.28"} com.cognitect/transit-clj {:mvn/version "1.0.333"} org.clojure/test.check {:mvn/version "1.1.1"} nrepl/bencode {:mvn/version "1.2.0"} @@ -51,7 +51,7 @@ insn/insn {:mvn/version "0.5.2"} org.clojure/core.rrb-vector {:mvn/version "0.1.2"} org.babashka/cli {:mvn/version "0.8.59"} - org.babashka/http-client {:mvn/version "0.4.20"} + org.babashka/http-client {:mvn/version "0.4.21"} org.flatland/ordered {:mvn/version "1.15.12"}} :aliases {:babashka/dev {:main-opts ["-m" "babashka.main"]} diff --git a/project.clj b/project.clj index bc8a5e7e..f2697ed5 100644 --- a/project.clj +++ b/project.clj @@ -36,13 +36,13 @@ [rewrite-clj/rewrite-clj "1.1.47"] [insn/insn "0.5.2"] [org.babashka/cli "0.8.59"] - [org.babashka/http-client "0.4.20"]] + [org.babashka/http-client "0.4.21"]] :plugins [[org.kipz/lein-meta-bom "0.1.1"]] :metabom {:jar-name "metabom.jar"} :profiles {:feature/xml {:source-paths ["feature-xml"] :dependencies [[org.clojure/data.xml "0.2.0-alpha8"]]} :feature/yaml {:source-paths ["feature-yaml"] - :dependencies [[clj-commons/clj-yaml "1.0.27" + :dependencies [[clj-commons/clj-yaml "1.0.28" :exclusions [org.flatland/ordered]#_#_clj-commons/clj-yaml "0.7.110"] [org.flatland/ordered "1.15.12"]]} :feature/jdbc {:source-paths ["feature-jdbc"] diff --git a/resources/META-INF/babashka/deps.edn b/resources/META-INF/babashka/deps.edn index 2f3a49c4..82ba2a18 100644 --- a/resources/META-INF/babashka/deps.edn +++ b/resources/META-INF/babashka/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"} @@ -31,7 +31,7 @@ org.clojure/data.csv {:mvn/version "1.0.0"}, cheshire/cheshire {:mvn/version "5.13.0"} org.clojure/data.xml {:mvn/version "0.2.0-alpha8"} - clj-commons/clj-yaml {:mvn/version "1.0.27"} + clj-commons/clj-yaml {:mvn/version "1.0.28"} com.cognitect/transit-clj {:mvn/version "1.0.333"} org.clojure/test.check {:mvn/version "1.1.1"} nrepl/bencode {:mvn/version "1.2.0"} @@ -51,7 +51,7 @@ insn/insn {:mvn/version "0.5.2"} org.clojure/core.rrb-vector {:mvn/version "0.1.2"} org.babashka/cli {:mvn/version "0.8.59"} - org.babashka/http-client {:mvn/version "0.4.20"} + org.babashka/http-client {:mvn/version "0.4.21"} org.flatland/ordered {:mvn/version "1.15.12"}} :aliases {:babashka/dev {:main-opts ["-m" "babashka.main"]} diff --git a/src/babashka/impl/clojure/core.clj b/src/babashka/impl/clojure/core.clj index fb39383d..44a0800e 100644 --- a/src/babashka/impl/clojure/core.clj +++ b/src/babashka/impl/clojure/core.clj @@ -27,6 +27,7 @@ (def math-context (core-dynamic-var '*math-context*)) (def compile-path (core-dynamic-var '*compile-path* *compile-path*)) (def compiler-options (core-dynamic-var '*compiler-options*)) +(def repl (core-dynamic-var '*repl* true)) ;; set to true, basically just a dummy for now (defn read+string "Added for compatibility. Must be used with @@ -55,7 +56,7 @@ The rounding mode is one of CEILING, FLOOR, HALF_UP, HALF_DOWN, HALF_EVEN, UP, DOWN and UNNECESSARY; it defaults to HALF_UP." [precision & exprs] - (let [[body rm] (if (= (first exprs) :rounding) + (let [[body rm] (if (= :rounding (first exprs)) [(next (next exprs)) `((. java.math.RoundingMode ~(second exprs)))] [exprs nil])] @@ -195,5 +196,15 @@ 'print-dup (sci/copy-var print-dup clojure-core-ns) 'PrintWriter-on (sci/copy-var PrintWriter-on clojure-core-ns) 'set-agent-send-executor! (sci/copy-var set-agent-send-executor! clojure-core-ns) - 'set-agent-send-off-executor! (sci/copy-var set-agent-send-off-executor! clojure-core-ns)} + 'set-agent-send-off-executor! (sci/copy-var set-agent-send-off-executor! clojure-core-ns) + ;; 1.12 + 'splitv-at (sci/copy-var splitv-at clojure-core-ns) + 'stream-transduce! (sci/copy-var stream-transduce! clojure-core-ns) + 'partitionv (sci/copy-var partitionv clojure-core-ns) + 'stream-into! (sci/copy-var stream-into! clojure-core-ns) + 'stream-reduce! (sci/copy-var stream-reduce! clojure-core-ns) + 'stream-seq! (sci/copy-var stream-seq! clojure-core-ns) + 'partitionv-all (sci/copy-var partitionv-all clojure-core-ns) + '*repl* repl + } )