luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into repl-deps

Browse source
This commit is contained in:
Michiel Borkent 2024-09-11 15:42:32 +02:00
commit 2b70f2771c
7 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/build.yml vendored
View file

@ -80,7 +80,7 @@ jobs:
BABASHKA_VERSION=$(cat resources/BABASHKA_VERSION) BABASHKA_VERSION=$(cat resources/BABASHKA_VERSION)
echo "##[set-output name=version;]${BABASHKA_VERSION}" echo "##[set-output name=version;]${BABASHKA_VERSION}"
- uses: actions/upload-artifact@v1 - uses: actions/upload-artifact@v4
with: with:
name: babashka-${{ steps.babashka-version.outputs.version }}-standalone.jar name: babashka-${{ steps.babashka-version.outputs.version }}-standalone.jar
path: target/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 run: .circleci/script/release
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v4
with: with:
path: bb path: bb
name: babashka-${{ steps.babashka-version.outputs.version }}-${{ matrix.name }}-amd64 name: babashka-${{ steps.babashka-version.outputs.version }}-${{ matrix.name }}-amd64
- name: Upload static artifact - name: Upload static artifact
if: "matrix.static == true" if: "matrix.static == true"
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v4
with: with:
path: bb path: bb
name: babashka-${{ steps.babashka-version.outputs.version }}-${{ matrix.name }}-static-amd64 name: babashka-${{ steps.babashka-version.outputs.version }}-${{ matrix.name }}-static-amd64

5
CHANGELOG.md
View file

@ -10,13 +10,16 @@ A preview of the next release can be installed from
## Unreleased ## Unreleased
- Upgrade Clojure to `1.12.0` - 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 - [#1598](https://github.com/babashka/babashka/issues/1598): use Rosetta on CircleCI to build x64 images
- Bump SCI - Bump SCI
- Bump `fs` - Bump `fs`
- Bump `process` - Bump `process`
- Bump `deps.clj` - Bump `deps.clj`
- Bump `http-client` - Bump `http-client`
- Bump `clj-yaml`
- Bump `edamame`
- Add `java.io.LineNumberReader` - Add `java.io.LineNumberReader`
## 1.3.191 (2024-06-19) ## 1.3.191 (2024-06-19)

2
deps.clj

@ -1 +1 @@
Subproject commit 42dae4007337ca9d31b4df83b652b03de8e09b7b Subproject commit 4fd62578e215b7341dd6c818259e47c461949573

4
deps.edn
View file

@ -31,7 +31,7 @@
org.clojure/data.csv {:mvn/version "1.0.0"}, org.clojure/data.csv {:mvn/version "1.0.0"},
cheshire/cheshire {:mvn/version "5.13.0"} cheshire/cheshire {:mvn/version "5.13.0"}
org.clojure/data.xml {:mvn/version "0.2.0-alpha8"} 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"} com.cognitect/transit-clj {:mvn/version "1.0.333"}
org.clojure/test.check {:mvn/version "1.1.1"} org.clojure/test.check {:mvn/version "1.1.1"}
nrepl/bencode {:mvn/version "1.2.0"} nrepl/bencode {:mvn/version "1.2.0"}
@ -51,7 +51,7 @@
insn/insn {:mvn/version "0.5.2"} insn/insn {:mvn/version "0.5.2"}
org.clojure/core.rrb-vector {:mvn/version "0.1.2"} org.clojure/core.rrb-vector {:mvn/version "0.1.2"}
org.babashka/cli {:mvn/version "0.8.59"} 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"}} org.flatland/ordered {:mvn/version "1.15.12"}}
:aliases {:babashka/dev :aliases {:babashka/dev
{:main-opts ["-m" "babashka.main"]} {:main-opts ["-m" "babashka.main"]}

4
project.clj
View file

@ -36,13 +36,13 @@
[rewrite-clj/rewrite-clj "1.1.47"] [rewrite-clj/rewrite-clj "1.1.47"]
[insn/insn "0.5.2"] [insn/insn "0.5.2"]
[org.babashka/cli "0.8.59"] [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"]] :plugins [[org.kipz/lein-meta-bom "0.1.1"]]
:metabom {:jar-name "metabom.jar"} :metabom {:jar-name "metabom.jar"}
:profiles {:feature/xml {:source-paths ["feature-xml"] :profiles {:feature/xml {:source-paths ["feature-xml"]
:dependencies [[org.clojure/data.xml "0.2.0-alpha8"]]} :dependencies [[org.clojure/data.xml "0.2.0-alpha8"]]}
:feature/yaml {:source-paths ["feature-yaml"] :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"] :exclusions [org.flatland/ordered]#_#_clj-commons/clj-yaml "0.7.110"]
[org.flatland/ordered "1.15.12"]]} [org.flatland/ordered "1.15.12"]]}
:feature/jdbc {:source-paths ["feature-jdbc"] :feature/jdbc {:source-paths ["feature-jdbc"]

6
resources/META-INF/babashka/deps.edn
View file

@ -18,7 +18,7 @@
"deps.clj/src" "deps.clj/resources" "deps.clj/src" "deps.clj/resources"
"resources" "sci/resources" "resources" "sci/resources"
"impl-java/src"], "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/sci {:local/root "sci"}
org.babashka/babashka.impl.java {:mvn/version "0.1.8"} org.babashka/babashka.impl.java {:mvn/version "0.1.8"}
org.babashka/sci.impl.types {:mvn/version "0.0.2"} org.babashka/sci.impl.types {:mvn/version "0.0.2"}
@ -31,7 +31,7 @@
org.clojure/data.csv {:mvn/version "1.0.0"}, org.clojure/data.csv {:mvn/version "1.0.0"},
cheshire/cheshire {:mvn/version "5.13.0"} cheshire/cheshire {:mvn/version "5.13.0"}
org.clojure/data.xml {:mvn/version "0.2.0-alpha8"} 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"} com.cognitect/transit-clj {:mvn/version "1.0.333"}
org.clojure/test.check {:mvn/version "1.1.1"} org.clojure/test.check {:mvn/version "1.1.1"}
nrepl/bencode {:mvn/version "1.2.0"} nrepl/bencode {:mvn/version "1.2.0"}
@ -51,7 +51,7 @@
insn/insn {:mvn/version "0.5.2"} insn/insn {:mvn/version "0.5.2"}
org.clojure/core.rrb-vector {:mvn/version "0.1.2"} org.clojure/core.rrb-vector {:mvn/version "0.1.2"}
org.babashka/cli {:mvn/version "0.8.59"} 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"}} org.flatland/ordered {:mvn/version "1.15.12"}}
:aliases {:babashka/dev :aliases {:babashka/dev
{:main-opts ["-m" "babashka.main"]} {:main-opts ["-m" "babashka.main"]}

15
src/babashka/impl/clojure/core.clj
View file

@ -27,6 +27,7 @@
(def math-context (core-dynamic-var '*math-context*)) (def math-context (core-dynamic-var '*math-context*))
(def compile-path (core-dynamic-var '*compile-path* *compile-path*)) (def compile-path (core-dynamic-var '*compile-path* *compile-path*))
(def compiler-options (core-dynamic-var '*compiler-options*)) (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 (defn read+string
"Added for compatibility. Must be used with "Added for compatibility. Must be used with
@ -55,7 +56,7 @@
The rounding mode is one of CEILING, FLOOR, HALF_UP, HALF_DOWN, The rounding mode is one of CEILING, FLOOR, HALF_UP, HALF_DOWN,
HALF_EVEN, UP, DOWN and UNNECESSARY; it defaults to HALF_UP." HALF_EVEN, UP, DOWN and UNNECESSARY; it defaults to HALF_UP."
[precision & exprs] [precision & exprs]
(let [[body rm] (if (= (first exprs) :rounding) (let [[body rm] (if (= :rounding (first exprs))
[(next (next exprs)) [(next (next exprs))
`((. java.math.RoundingMode ~(second exprs)))] `((. java.math.RoundingMode ~(second exprs)))]
[exprs nil])] [exprs nil])]
@ -195,5 +196,15 @@
'print-dup (sci/copy-var print-dup clojure-core-ns) 'print-dup (sci/copy-var print-dup clojure-core-ns)
'PrintWriter-on (sci/copy-var PrintWriter-on 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-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
}
) )