From d823da4a5269a30fc1619bd37512e16443afc803 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Tue, 10 Dec 2024 16:28:46 +0100 Subject: [PATCH 1/4] tools analyzer workaround, #734 --- deps.edn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deps.edn b/deps.edn index 8cc61690b..fe8ee7d2f 100644 --- a/deps.edn +++ b/deps.edn @@ -2,7 +2,9 @@ :deps {org.clojure/clojure {:mvn/version "1.10.3"} org.clojure/java.classpath {:mvn/version "1.0.0"} org.clojure/tools.analyzer {:mvn/version "1.2.0"} - org.clojure/tools.analyzer.jvm {:mvn/version "1.3.0"} + org.clojure/tools.analyzer.jvm {:git/url "https://github.com/borkude/tools.analyzer.jvm" + :git/sha "f8f44e023a05ff86f35a38086722da352afae2f6"} + #_{:mvn/version "1.3.0"} babashka/fs {:mvn/version "0.5.22"} borkdude/edamame {:mvn/version "1.4.24"} weavejester/dependency {:mvn/version "0.2.1"} From f1bfbb68cd80c2afb76a9baba8b50ba18a25bb8e Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Tue, 10 Dec 2024 16:58:17 +0100 Subject: [PATCH 2/4] wip --- deps.edn | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/deps.edn b/deps.edn index fe8ee7d2f..595580349 100644 --- a/deps.edn +++ b/deps.edn @@ -2,8 +2,8 @@ :deps {org.clojure/clojure {:mvn/version "1.10.3"} org.clojure/java.classpath {:mvn/version "1.0.0"} org.clojure/tools.analyzer {:mvn/version "1.2.0"} - org.clojure/tools.analyzer.jvm {:git/url "https://github.com/borkude/tools.analyzer.jvm" - :git/sha "f8f44e023a05ff86f35a38086722da352afae2f6"} + org.clojure/tools.analyzer.jvm {:git/url "https://github.com/borkdude/tools.analyzer.jvm" + :git/sha "86e7d1f6f1aa048b468d42ed9a596b6104012416"} #_{:mvn/version "1.3.0"} babashka/fs {:mvn/version "0.5.22"} borkdude/edamame {:mvn/version "1.4.24"} @@ -29,7 +29,7 @@ juji/editscript {:mvn/version "0.6.4"}} - :aliases {:nextjournal/clerk {:extra-deps {org.clojure/clojure {:mvn/version "1.11.1"} ;; for `:as-alias` support in static build + :aliases {:nextjournal/clerk {:extra-deps {org.clojure/clojure {:mvn/version "1.12.0"} org.slf4j/slf4j-nop {:mvn/version "2.0.7"} org.babashka/cli {:mvn/version "0.7.52"}} :extra-paths ["notebooks"] @@ -85,7 +85,8 @@ org.clojure/data.csv {:mvn/version "1.0.0"} hickory/hickory {:mvn/version "0.7.1"} org.mentat/emmy {:mvn/version "0.32.0" - :exclusions [org.babashka/sci] + :exclusions [org.babashka/sci + org.clojure/tools.analyzer.jvm] ;; use :sci alias in addition to this } io.github.nextjournal/clerk-slideshow {:git/sha "11a83fea564da04b9d17734f2031a4921d917893"}}} @@ -96,7 +97,9 @@ :build {:deps {io.github.nextjournal/clerk {:local/root "."} io.github.nextjournal/cas-client {:git/sha "d9f838937ebc8b645fe5764949e72a6df8e344de"} - io.github.clojure/tools.build {:git/tag "v0.10.3" :git/sha "15ead66"} + io.github.clojure/tools.build {:git/tag "v0.10.3" :git/sha "15ead66" + :exclusions [org.babashka/sci + org.clojure/tools.analyzer.jvm]} io.github.slipset/deps-deploy {:git/sha "b4359c5d67ca002d9ed0c4b41b710d7e5a82e3bf"}} :extra-paths ["bb" "src" "resources"] ;; for loading lookup-url in build :ns-default build} From 75459558af58ee5a3637da3de73d8a2da0c4c6c2 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Tue, 10 Dec 2024 16:58:30 +0100 Subject: [PATCH 3/4] clojure 1.12 --- notebooks/clojure_1_12.clj | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 notebooks/clojure_1_12.clj diff --git a/notebooks/clojure_1_12.clj b/notebooks/clojure_1_12.clj new file mode 100644 index 000000000..881930a66 --- /dev/null +++ b/notebooks/clojure_1_12.clj @@ -0,0 +1,10 @@ +(ns clojure-1-12) + +^{:nextjournal.clerk/visibility {:result :hide}} +(defn to-matrix [input] + (for [line (String/.split input "\\n") + :let [numbers (String/.split line "\\s+")]] + (map parse-long #_Long/parseLong numbers))) + +(to-matrix "1 1 2 +4 5 6") From 608d339b051092a23d3d289df560f8e75344dde3 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Tue, 10 Dec 2024 17:35:49 +0100 Subject: [PATCH 4/4] fix field --- deps.edn | 2 +- notebooks/clojure_1_12.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps.edn b/deps.edn index 595580349..c0a866d2b 100644 --- a/deps.edn +++ b/deps.edn @@ -3,7 +3,7 @@ org.clojure/java.classpath {:mvn/version "1.0.0"} org.clojure/tools.analyzer {:mvn/version "1.2.0"} org.clojure/tools.analyzer.jvm {:git/url "https://github.com/borkdude/tools.analyzer.jvm" - :git/sha "86e7d1f6f1aa048b468d42ed9a596b6104012416"} + :git/sha "318dc38f0a903fabb22a7e2caafea5a5b4c37df8"} #_{:mvn/version "1.3.0"} babashka/fs {:mvn/version "0.5.22"} borkdude/edamame {:mvn/version "1.4.24"} diff --git a/notebooks/clojure_1_12.clj b/notebooks/clojure_1_12.clj index 881930a66..74a20cf46 100644 --- a/notebooks/clojure_1_12.clj +++ b/notebooks/clojure_1_12.clj @@ -4,7 +4,7 @@ (defn to-matrix [input] (for [line (String/.split input "\\n") :let [numbers (String/.split line "\\s+")]] - (map parse-long #_Long/parseLong numbers))) + (map Long/parseLong numbers))) (to-matrix "1 1 2 4 5 6")