diff --git a/CHANGELOG.md b/CHANGELOG.md index 8273e9a5..29cddb95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,9 +9,9 @@ A preview of the next release can be installed from ## Unreleased -- [#1752](https://github.com/babashka/babashka/issues/1752): include java.lang.SecurityException for java.net.http.HttpClient support - +- [#1752](https://github.com/babashka/babashka/issues/1752): include `java.lang.SecurityException` for `java.net.http.HttpClient` support - [#1748](https://github.com/babashka/babashka/issues/1748): add `clojure.core/ensure` +- Upgrade to `taoensso/timbre` `v6.6.0` ## 1.12.194 (2024-10-12) diff --git a/deps.edn b/deps.edn index 257ca0e3..7eb7fa66 100644 --- a/deps.edn +++ b/deps.edn @@ -45,7 +45,7 @@ hiccup/hiccup {:mvn/version "2.0.0-RC1"} rewrite-clj/rewrite-clj {:mvn/version "1.1.48"} selmer/selmer {:mvn/version "1.12.59"} - com.taoensso/timbre {:mvn/version "6.5.0"} + com.taoensso/timbre {:mvn/version "6.6.0"} org.clojure/tools.logging {:mvn/version "1.1.0"} org.clojure/data.priority-map {:mvn/version "1.1.0"} insn/insn {:mvn/version "0.5.2"} diff --git a/feature-logging/babashka/impl/logging.clj b/feature-logging/babashka/impl/logging.clj index 9aa51e83..096a7b1a 100644 --- a/feature-logging/babashka/impl/logging.clj +++ b/feature-logging/babashka/impl/logging.clj @@ -59,7 +59,9 @@ ;; Note pre-resolved expansion `(taoensso.timbre/-log! ~config ~level ~ns ~file ~line ~column ~msg-type ~?err - (delay ~vargs-form) ~?base-data ~callsite-id ~spying?))))) + (delay ~vargs-form) ~?base-data ~callsite-id ~spying? + ~(get opts :instant) + ~(get opts :may-log?)))))) ([level msg-type args & [opts]] (let [{:keys [line column]} (merge (meta &form)) diff --git a/project.clj b/project.clj index d57cf278..8b93769c 100644 --- a/project.clj +++ b/project.clj @@ -73,7 +73,7 @@ :feature/selmer {:source-paths ["feature-selmer"] :dependencies [[selmer/selmer "1.12.59"]]} :feature/logging {:source-paths ["feature-logging"] - :dependencies [[com.taoensso/timbre "6.5.0"] + :dependencies [[com.taoensso/timbre "6.6.0"] [org.clojure/tools.logging "1.1.0"]]} :feature/priority-map {:source-paths ["feature-priority-map"] :dependencies [[org.clojure/data.priority-map "1.1.0"]]} diff --git a/resources/META-INF/babashka/deps.edn b/resources/META-INF/babashka/deps.edn index 257ca0e3..7eb7fa66 100644 --- a/resources/META-INF/babashka/deps.edn +++ b/resources/META-INF/babashka/deps.edn @@ -45,7 +45,7 @@ hiccup/hiccup {:mvn/version "2.0.0-RC1"} rewrite-clj/rewrite-clj {:mvn/version "1.1.48"} selmer/selmer {:mvn/version "1.12.59"} - com.taoensso/timbre {:mvn/version "6.5.0"} + com.taoensso/timbre {:mvn/version "6.6.0"} org.clojure/tools.logging {:mvn/version "1.1.0"} org.clojure/data.priority-map {:mvn/version "1.1.0"} insn/insn {:mvn/version "0.5.2"}