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

Merge branch 'master' into timbre-log-issue-1679

Browse source
This commit is contained in:
Michiel Borkent 2024-03-14 17:06:19 +01:00
commit 82fa81fefb
5 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
deps.edn
View file

@ -50,7 +50,7 @@
org.clojure/data.priority-map {:mvn/version "1.1.0"} org.clojure/data.priority-map {:mvn/version "1.1.0"}
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.57"} org.babashka/cli {:mvn/version "0.8.58"}
org.babashka/http-client {:mvn/version "0.4.16"} org.babashka/http-client {:mvn/version "0.4.16"}
;; native image bloat with ordered 1.5.10 ;; native image bloat with ordered 1.5.10
org.flatland/ordered {:mvn/version "1.5.9"}} org.flatland/ordered {:mvn/version "1.5.9"}}

2
project.clj
View file

@ -35,7 +35,7 @@
[com.github.clj-easy/graal-build-time "0.1.0"] [com.github.clj-easy/graal-build-time "0.1.0"]
[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.57"] [org.babashka/cli "0.8.58"]
[org.babashka/http-client "0.4.16"]] [org.babashka/http-client "0.4.16"]]
: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"}

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.1"}, :deps {org.clojure/clojure {:mvn/version "1.11.2"},
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"}
@ -39,7 +39,7 @@
org.postgresql/postgresql {:mvn/version "42.2.18"} org.postgresql/postgresql {:mvn/version "42.2.18"}
org.hsqldb/hsqldb {:mvn/version "2.5.1"} org.hsqldb/hsqldb {:mvn/version "2.5.1"}
datascript/datascript {:mvn/version "1.0.1"} datascript/datascript {:mvn/version "1.0.1"}
http-kit/http-kit {:mvn/version "2.8.0-beta3"} http-kit/http-kit {:mvn/version "2.8.0-RC1"}
babashka/clojure-lanterna {:mvn/version "0.9.8-SNAPSHOT"} babashka/clojure-lanterna {:mvn/version "0.9.8-SNAPSHOT"}
org.clojure/core.match {:mvn/version "1.0.0"} org.clojure/core.match {:mvn/version "1.0.0"}
hiccup/hiccup {:mvn/version "2.0.0-RC1"} hiccup/hiccup {:mvn/version "2.0.0-RC1"}
@ -50,7 +50,7 @@
org.clojure/data.priority-map {:mvn/version "1.1.0"} org.clojure/data.priority-map {:mvn/version "1.1.0"}
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.57"} org.babashka/cli {:mvn/version "0.8.58"}
org.babashka/http-client {:mvn/version "0.4.16"} org.babashka/http-client {:mvn/version "0.4.16"}
;; native image bloat with ordered 1.5.10 ;; native image bloat with ordered 1.5.10
org.flatland/ordered {:mvn/version "1.5.9"}} org.flatland/ordered {:mvn/version "1.5.9"}}

3
src/babashka/impl/classes.clj
View file

@ -333,6 +333,7 @@
java.lang.StringBuilder java.lang.StringBuilder
java.lang.System java.lang.System
java.lang.Throwable java.lang.Throwable
java.lang.ThreadLocal
java.lang.Thread$UncaughtExceptionHandler java.lang.Thread$UncaughtExceptionHandler
java.lang.UnsupportedOperationException java.lang.UnsupportedOperationException
java.lang.ref.WeakReference java.lang.ref.WeakReference
@ -460,6 +461,7 @@
java.util.concurrent.Callable java.util.concurrent.Callable
java.util.concurrent.CancellationException java.util.concurrent.CancellationException
java.util.concurrent.CompletionException java.util.concurrent.CompletionException
java.util.concurrent.CountDownLatch
java.util.concurrent.ExecutionException java.util.concurrent.ExecutionException
java.util.concurrent.Executor java.util.concurrent.Executor
java.util.concurrent.ExecutorService java.util.concurrent.ExecutorService
@ -828,6 +830,7 @@
StringBuilder java.lang.StringBuilder StringBuilder java.lang.StringBuilder
System java.lang.System System java.lang.System
Thread java.lang.Thread Thread java.lang.Thread
ThreadLocal java.lang.ThreadLocal
Thread$UncaughtExceptionHandler java.lang.Thread$UncaughtExceptionHandler Thread$UncaughtExceptionHandler java.lang.Thread$UncaughtExceptionHandler
Throwable java.lang.Throwable Throwable java.lang.Throwable
VirtualMachineError java.lang.VirtualMachineError VirtualMachineError java.lang.VirtualMachineError

9
src/babashka/impl/proxy.clj
View file

@ -125,6 +125,11 @@
([x y z] ([x y z]
((method-or-bust methods 'checkServerTrusted) this x y z))) ((method-or-bust methods 'checkServerTrusted) this x y z)))
(getAcceptedIssuers [] ((method-or-bust methods 'getAcceptedIssuers) this))) (getAcceptedIssuers [] ((method-or-bust methods 'getAcceptedIssuers) this)))
["java.lang.ThreadLocal" #{}]
(proxy [java.lang.ThreadLocal] []
(initialValue []
((method-or-bust methods 'initialValue) this)))
, ;; keep this for merge friendliness , ;; keep this for merge friendliness
))) )))
@ -137,7 +142,9 @@
{:methods [{:name "connectFailed"} {:methods [{:name "connectFailed"}
{:name "select"}]} {:name "select"}]}
(class-sym (class (proxy-fn {:class javax.net.ssl.HostnameVerifier}))) (class-sym (class (proxy-fn {:class javax.net.ssl.HostnameVerifier})))
{:methods [{:name "verify"}]}}) {:methods [{:name "verify"}]}
(class-sym (class (proxy-fn {:class java.lang.ThreadLocal})))
{:methods [{:name "get"}]}})
;;; Scratch ;;; Scratch