From 8a0f66f3c1d6cc34de3e56b7fb61bf3f64a86c26 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Tue, 12 Mar 2024 11:58:26 +0100 Subject: [PATCH 1/3] Bump cli --- deps.edn | 2 +- project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps.edn b/deps.edn index bf453e6d..02cc822b 100644 --- a/deps.edn +++ b/deps.edn @@ -50,7 +50,7 @@ org.clojure/data.priority-map {:mvn/version "1.1.0"} insn/insn {:mvn/version "0.5.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"} ;; native image bloat with ordered 1.5.10 org.flatland/ordered {:mvn/version "1.5.9"}} diff --git a/project.clj b/project.clj index 00c5746c..baefd1fa 100644 --- a/project.clj +++ b/project.clj @@ -35,7 +35,7 @@ [com.github.clj-easy/graal-build-time "0.1.0"] [rewrite-clj/rewrite-clj "1.1.47"] [insn/insn "0.5.2"] - [org.babashka/cli "0.8.57"] + [org.babashka/cli "0.8.58"] [org.babashka/http-client "0.4.16"]] :plugins [[org.kipz/lein-meta-bom "0.1.1"]] :metabom {:jar-name "metabom.jar"} From 81819deb0a166e615bcf6ac7cba5ad845afbc9c7 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Wed, 13 Mar 2024 09:08:22 +0100 Subject: [PATCH 2/3] Add java.util.concurrent.CountDownLatch --- src/babashka/impl/classes.clj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/babashka/impl/classes.clj b/src/babashka/impl/classes.clj index 1cbdad93..7ec8f42a 100644 --- a/src/babashka/impl/classes.clj +++ b/src/babashka/impl/classes.clj @@ -460,6 +460,7 @@ java.util.concurrent.Callable java.util.concurrent.CancellationException java.util.concurrent.CompletionException + java.util.concurrent.CountDownLatch java.util.concurrent.ExecutionException java.util.concurrent.Executor java.util.concurrent.ExecutorService From 1a454b10bb6369257cbc659e45fb51cd6c5d2dd6 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Thu, 14 Mar 2024 16:57:06 +0100 Subject: [PATCH 3/3] Add java.lang.ThreadLocal (#1682) --- resources/META-INF/babashka/deps.edn | 6 +++--- src/babashka/impl/classes.clj | 2 ++ src/babashka/impl/proxy.clj | 9 ++++++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/resources/META-INF/babashka/deps.edn b/resources/META-INF/babashka/deps.edn index bd2fbdac..02cc822b 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.1"}, + :deps {org.clojure/clojure {:mvn/version "1.11.2"}, 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"} @@ -39,7 +39,7 @@ org.postgresql/postgresql {:mvn/version "42.2.18"} org.hsqldb/hsqldb {:mvn/version "2.5.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"} org.clojure/core.match {:mvn/version "1.0.0"} hiccup/hiccup {:mvn/version "2.0.0-RC1"} @@ -50,7 +50,7 @@ org.clojure/data.priority-map {:mvn/version "1.1.0"} insn/insn {:mvn/version "0.5.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"} ;; native image bloat with ordered 1.5.10 org.flatland/ordered {:mvn/version "1.5.9"}} diff --git a/src/babashka/impl/classes.clj b/src/babashka/impl/classes.clj index 7ec8f42a..2b552cb5 100644 --- a/src/babashka/impl/classes.clj +++ b/src/babashka/impl/classes.clj @@ -333,6 +333,7 @@ java.lang.StringBuilder java.lang.System java.lang.Throwable + java.lang.ThreadLocal java.lang.Thread$UncaughtExceptionHandler java.lang.UnsupportedOperationException java.lang.ref.WeakReference @@ -829,6 +830,7 @@ StringBuilder java.lang.StringBuilder System java.lang.System Thread java.lang.Thread + ThreadLocal java.lang.ThreadLocal Thread$UncaughtExceptionHandler java.lang.Thread$UncaughtExceptionHandler Throwable java.lang.Throwable VirtualMachineError java.lang.VirtualMachineError diff --git a/src/babashka/impl/proxy.clj b/src/babashka/impl/proxy.clj index 8c9c3e8a..7e4ad722 100644 --- a/src/babashka/impl/proxy.clj +++ b/src/babashka/impl/proxy.clj @@ -125,6 +125,11 @@ ([x y z] ((method-or-bust methods 'checkServerTrusted) this x y z))) (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 ))) @@ -137,7 +142,9 @@ {:methods [{:name "connectFailed"} {:name "select"}]} (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