From 0b300c134a3e038a770e1866650f08d62a37318e Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Thu, 25 Feb 2021 14:51:01 +0100
Subject: [PATCH 001/145] sci: add dissoc!

---
 sci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci b/sci
index 043f5e60..1702cae3 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit 043f5e60d674f5aeee0866e427cef58812ad5547
+Subproject commit 1702cae36e6a676fe0f418a90c993ebbc9d65a58

From 338fc2ac133073d3b73aecf1c29cd4adcd51e5bf Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Thu, 25 Feb 2021 20:19:46 +0100
Subject: [PATCH 002/145] sci: fix instance on IAtom

---
 CHANGELOG.md | 2 ++
 sci          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65c4c233..a05c228a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@ Sci:
 
 - Detect cyclic load dependencies [#531](https://github.com/babashka/babashka/issues/531)
 - Pick fn arity independent of written order [#532](https://github.com/babashka/babashka/issues/532) ([@GreshamDanielStephens](https://github.com/GreshamDanielStephens))
+- `(instance? clojure.lang.IAtom 1)` returns `true` [#537](https://github.com/borkdude/sci/issues/537)
+- Add `dissoc!`
 
 Babashka.fs:
 
diff --git a/sci b/sci
index 1702cae3..e3078a96 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit 1702cae36e6a676fe0f418a90c993ebbc9d65a58
+Subproject commit e3078a967e2c33675aa3f7cd36df43d788c7a470

From 23704a7db69d61bb68101769e6d887361e8f8b5a Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Thu, 25 Feb 2021 20:41:06 +0100
Subject: [PATCH 003/145] sci: fix ns-unmap on referred var

---
 CHANGELOG.md | 3 ++-
 sci          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a05c228a..80ca9ae0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,8 @@ Sci:
 - Detect cyclic load dependencies [#531](https://github.com/babashka/babashka/issues/531)
 - Pick fn arity independent of written order [#532](https://github.com/babashka/babashka/issues/532) ([@GreshamDanielStephens](https://github.com/GreshamDanielStephens))
 - `(instance? clojure.lang.IAtom 1)` returns `true` [#537](https://github.com/borkdude/sci/issues/537)
-- Add `dissoc!`
+- Add `dissoc!`(@wilkerlucio)
+- Fix `ns-unmap` on referred var [#539](https://github.com/borkdude/sci/issues/539)
 
 Babashka.fs:
 
diff --git a/sci b/sci
index e3078a96..82327671 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit e3078a967e2c33675aa3f7cd36df43d788c7a470
+Subproject commit 82327671a885f1c7be106112a58f0fed7775c6f1

From acc8972a40bbf7bfef3267ffc75f3600098aadfb Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Fri, 26 Feb 2021 13:58:46 +0100
Subject: [PATCH 004/145] sci: add force

---
 sci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci b/sci
index 82327671..8cf95770 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit 82327671a885f1c7be106112a58f0fed7775c6f1
+Subproject commit 8cf95770573dc72eca3a93aeb1ee4c8c6c06abe9

From d31bcabeb255caaddb891dd4c7a849359b5e43f5 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Fri, 26 Feb 2021 13:59:08 +0100
Subject: [PATCH 005/145] Add force

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80ca9ae0..70ea30d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ Sci:
 - Pick fn arity independent of written order [#532](https://github.com/babashka/babashka/issues/532) ([@GreshamDanielStephens](https://github.com/GreshamDanielStephens))
 - `(instance? clojure.lang.IAtom 1)` returns `true` [#537](https://github.com/borkdude/sci/issues/537)
 - Add `dissoc!`(@wilkerlucio)
+- Add `force`
 - Fix `ns-unmap` on referred var [#539](https://github.com/borkdude/sci/issues/539)
 
 Babashka.fs:

From 00e65f0416cfdce9d5515feebc873b58961f00b7 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Fri, 26 Feb 2021 22:17:24 +0100
Subject: [PATCH 006/145] [#738] upgrade to httpkit 2.5.3

---
 deps.edn           | 2 +-
 project.clj        | 4 ++--
 script/compile     | 1 +
 script/compile.bat | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/deps.edn b/deps.edn
index d9ed180b..39325e38 100644
--- a/deps.edn
+++ b/deps.edn
@@ -30,7 +30,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.5.1"}
+        http-kit/http-kit {:mvn/version "2.5.3"}
         babashka/clojure-lanterna {:mvn/version "0.9.8-SNAPSHOT"}
         org.clojure/math.combinatorics {:mvn/version "0.1.6"}
         org.clojure/core.match {:mvn/version "1.0.0"}
diff --git a/project.clj b/project.clj
index b91000a0..8c3855f7 100644
--- a/project.clj
+++ b/project.clj
@@ -42,9 +42,9 @@
              :feature/datascript {:source-paths ["feature-datascript"]
                                   :dependencies [[datascript "1.0.1"]]}
              :feature/httpkit-client {:source-paths ["feature-httpkit-client"]
-                                      :dependencies [[http-kit "2.5.1"]]}
+                                      :dependencies [[http-kit "2.5.3"]]}
              :feature/httpkit-server {:source-paths ["feature-httpkit-server"]
-                                      :dependencies [[http-kit "2.5.1"]]}
+                                      :dependencies [[http-kit "2.5.3"]]}
              :feature/lanterna {:source-paths ["feature-lanterna"]
                                 :dependencies [[babashka/clojure-lanterna "0.9.8-SNAPSHOT"]]}
              :feature/core-match {:source-paths ["feature-core-match"]
diff --git a/script/compile b/script/compile
index 5451c4f6..da9d08a2 100755
--- a/script/compile
+++ b/script/compile
@@ -61,6 +61,7 @@ args=( "-jar" "$BABASHKA_JAR"
        "--no-server"
        "--report-unsupported-elements-at-runtime"
        "--initialize-at-run-time=org.postgresql.sspi.SSPIClient"
+       "--initialize-at-run-time=org.httpkit.client.ClientSslEngineFactory\$SSLHolder"
        "--native-image-info"
        "--verbose"
        "-H:ServiceLoaderFeatureExcludeServices=javax.sound.sampled.spi.AudioFileReader"
diff --git a/script/compile.bat b/script/compile.bat
index f0f13db2..7e62fa4e 100644
--- a/script/compile.bat
+++ b/script/compile.bat
@@ -34,6 +34,7 @@ call %GRAALVM_HOME%\bin\native-image.cmd ^
   "-H:ReflectionConfigurationFiles=reflection.json" ^
   "--initialize-at-build-time"  ^
   "--initialize-at-run-time=org.postgresql.sspi.SSPIClient" ^
+  "--initialize-at-run-time=org.httpkit.client.ClientSslEngineFactory\$SSLHolder" ^
   "-H:EnableURLProtocols=http,https,jar" ^
   "--enable-all-security-services" ^
   "-H:+JNI" ^

From 17694a328b872e8ec954b0070cd10234dfc94b47 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Fri, 26 Feb 2021 22:18:28 +0100
Subject: [PATCH 007/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70ea30d6..56bc9423 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ For a list of breaking changes, check [here](#breaking-changes).
 ### Enhancements / fixes
 
 - Use default `*print-right-margin*` value from `clojure.pprint`
+- Upgrade httpkit to 2.5.3 [#738](https://github.com/babashka/babashka/issues/738)
 
 Sci:
 

From 8733bcb795a8da501fdd5cb1f8e49264e497b308 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 27 Feb 2021 10:15:28 +0100
Subject: [PATCH 008/145] Add classes for instance checks (#739)

---
 src/babashka/impl/classes.clj | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/babashka/impl/classes.clj b/src/babashka/impl/classes.clj
index 0ec769f1..260f15a8 100644
--- a/src/babashka/impl/classes.clj
+++ b/src/babashka/impl/classes.clj
@@ -249,21 +249,21 @@
     :methods [borkdude.graal.LockFix] ;; support for locking
 
     :fields [clojure.lang.PersistentQueue]
-    :instance-checks [clojure.lang.Cons
+    :instance-checks [clojure.lang.Atom
+                      clojure.lang.Cons
                       clojure.lang.Cycle
                       clojure.lang.IObj
                       clojure.lang.Fn ;; to distinguish fns from maps, etc.
                       clojure.lang.IFn
                       clojure.lang.IPending
-                      ;; clojure.lang.IDeref
-                      ;; clojure.lang.IAtom
+                      ;; clojure.lang.IDeref ;; implemented as protocol in sci
+                      ;; clojure.lang.IAtom  ;; implemented as protocol in sci
                       clojure.lang.IEditableCollection
                       clojure.lang.IMapEntry
                       clojure.lang.ILookup
                       clojure.lang.IPersistentCollection
                       clojure.lang.IPersistentMap
                       clojure.lang.IPersistentSet
-                      ;;clojure.lang.PersistentHashSet ;; temp for meander
                       clojure.lang.IPersistentVector
                       clojure.lang.IRecord
                       clojure.lang.IRef
@@ -272,11 +272,21 @@
                       clojure.lang.LazySeq
                       clojure.lang.Named
                       clojure.lang.Keyword
+                      clojure.lang.PersistentArrayMap
+                      clojure.lang.PersistentHashMap
+                      clojure.lang.PersistentHashSet
+                      clojure.lang.PersistentList
+                      clojure.lang.PersistentQueue
+                      clojure.lang.PersistentStructMap
+                      clojure.lang.PersistentTreeMap
+                      clojure.lang.PersistentTreeSet
+                      clojure.lang.PersistentVector
                       clojure.lang.Ratio
                       clojure.lang.Repeat
                       clojure.lang.Symbol
                       clojure.lang.Sequential
                       clojure.lang.Seqable
+                      clojure.lang.Volatile
                       java.util.List]
     :custom ~custom-map})
 

From 5376acb80d00dee7325e92acda0873807191cd08 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 27 Feb 2021 11:15:11 +0100
Subject: [PATCH 009/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56bc9423..54e65e22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ For a list of breaking changes, check [here](#breaking-changes).
 
 - Use default `*print-right-margin*` value from `clojure.pprint`
 - Upgrade httpkit to 2.5.3 [#738](https://github.com/babashka/babashka/issues/738)
+- Add several classes to be used with `defprotocol` (`PersistentVector`, `PersistentHashSet`, ...)
 
 Sci:
 

From 94cd930d4f196bde7e9b71b7a583e3be67d79cec Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 27 Feb 2021 21:18:11 +0100
Subject: [PATCH 010/145] README [skip ci]

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 47b6d4de..f3daf930 100644
--- a/README.md
+++ b/README.md
@@ -5,8 +5,6 @@
 [![Financial Contributors on Open Collective](https://opencollective.com/babashka/all/badge.svg?label=financial+contributors)](https://opencollective.com/babashka) [![Clojars Project](https://img.shields.io/clojars/v/babashka/babashka.svg)](https://clojars.org/babashka/babashka)
 [![twitter](https://img.shields.io/badge/twitter-%23babashka-blue)](https://twitter.com/search?q=%23babashka&src=typed_query&f=live)
 
-A Clojure [babushka](https://en.wikipedia.org/wiki/Headscarf) for the grey areas of Bash.
-
 <blockquote class="twitter-tweet" data-lang="en">
     <p lang="en" dir="ltr">Life's too short to remember how to write Bash code. I feel liberated.</p>
     &mdash;

From a5a0eb73d223fd17674b6a82b83e84573808e3ab Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 27 Feb 2021 21:38:41 +0100
Subject: [PATCH 011/145] README [skip ci]

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f3daf930..f5729c17 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,8 @@
 
 ## Introduction
 
-The main idea behind babashka is to leverage Clojure in places where you would
-be using bash otherwise.
+Babashka is a native Clojure interpreter for scripting. Its main goal is to
+leverage Clojure in places where you would be using bash otherwise.
 
 As one user described it:
 

From 8819e1dc4622bb020b32dfc2b48afa19431b6524 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Feb 2021 10:49:07 +0100
Subject: [PATCH 012/145] tools.cli update to 1.0.206

---
 deps.edn    | 2 +-
 project.clj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deps.edn b/deps.edn
index 39325e38..c47e1d5c 100644
--- a/deps.edn
+++ b/deps.edn
@@ -18,7 +18,7 @@
         babashka/fs {:local/root "fs"}
         borkdude/graal.locking {:mvn/version "0.0.2"},
         org.clojure/core.async {:mvn/version "1.3.610"},
-        org.clojure/tools.cli {:mvn/version "1.0.194"},
+        org.clojure/tools.cli {:mvn/version "1.0.206"},
         org.clojure/data.csv {:mvn/version "1.0.0"},
         cheshire/cheshire {:mvn/version "5.10.0"}
         org.clojure/data.xml {:mvn/version "0.2.0-alpha6"}
diff --git a/project.clj b/project.clj
index 8c3855f7..0bb8fa1a 100644
--- a/project.clj
+++ b/project.clj
@@ -17,7 +17,7 @@
   :dependencies [[org.clojure/clojure "1.10.2"]
                  [borkdude/edamame "0.0.11-alpha.29"]
                  [borkdude/graal.locking "0.0.2"]
-                 [org.clojure/tools.cli "1.0.194"]
+                 [org.clojure/tools.cli "1.0.206"]
                  [cheshire "5.10.0"]
                  [nrepl/bencode "1.1.0"]
                  [borkdude/sci.impl.reflector "0.0.1"]

From 250b1e1c5fa35ed4a877335f6e430438f1908c90 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Feb 2021 10:50:09 +0100
Subject: [PATCH 013/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54e65e22..56612c1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ For a list of breaking changes, check [here](#breaking-changes).
 
 - Use default `*print-right-margin*` value from `clojure.pprint`
 - Upgrade httpkit to 2.5.3 [#738](https://github.com/babashka/babashka/issues/738)
+- Upgrade tools.cli to 1.0.206
 - Add several classes to be used with `defprotocol` (`PersistentVector`, `PersistentHashSet`, ...)
 
 Sci:

From f59b0efab4c2660e8884beff446198303d1619aa Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Feb 2021 16:31:29 +0100
Subject: [PATCH 014/145] sci [skip ci]

---
 CHANGELOG.md | 1 +
 sci          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56612c1b..26b2d1b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ Babashka.fs:
 Babashka.nrepl:
 
 - Fix printing in lazy value [#36](https://github.com/babashka/babashka.nrepl/issues/36)
+- Update link in nREPL server message [#37](https://github.com/babashka/babashka.nrepl/issues/37)
 
 ## 0.2.10
 
diff --git a/sci b/sci
index 8cf95770..96a0c77d 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit 8cf95770573dc72eca3a93aeb1ee4c8c6c06abe9
+Subproject commit 96a0c77d75066746b91ab242dc144d04b10b399b

From e64dbc7691281abcdb8bbba074ab146be7d1ec73 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Feb 2021 18:23:45 +0100
Subject: [PATCH 015/145] Support reifying clojure.lang.IFn and
 clojure.lang.ILookup (#740)

---
 sci                         |  2 +-
 src/babashka/impl/reify.clj | 56 ++++++++++++++++++++++++++++---------
 test/babashka/main_test.clj | 30 ++++++++++++++++++++
 3 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/sci b/sci
index 96a0c77d..d174e28f 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit 96a0c77d75066746b91ab242dc144d04b10b399b
+Subproject commit d174e28fcb05a53868404c7cd0efc43093b66442
diff --git a/src/babashka/impl/reify.clj b/src/babashka/impl/reify.clj
index 11b9cb1f..57644f77 100644
--- a/src/babashka/impl/reify.clj
+++ b/src/babashka/impl/reify.clj
@@ -18,23 +18,53 @@
                                   (mapcat
                                    (fn [[clazz methods]]
                                      (cons clazz
-                                           (map
-                                            (fn [[meth args]]
-                                              (list meth args
-                                                    (list*
-                                                     (list 'get-in 'methods
-                                                           [(list 'quote clazz) (list 'quote meth)])
-                                                     args)))
-                                                     methods)))
+                                           (mapcat
+                                            (fn [[meth arities]]
+                                              (map
+                                               (fn [arity]
+                                                 (list meth arity
+                                                       (list*
+                                                        (list 'get-in 'methods
+                                                              [(list 'quote clazz) (list 'quote meth)])
+                                                        arity)))
+                                               arities))
+                                            methods)))
                                    classes)))))
             {}
             subsets)))
 
+#_(prn (macroexpand '(gen-reify-combos
+                    {java.io.FileFilter {accept [[this f]]}})))
+
 #_:clj-kondo/ignore
 (def reify-opts
   (gen-reify-combos
-   {java.nio.file.FileVisitor {preVisitDirectory [this p attrs]
-                               postVisitDirectory [this p attrs]
-                               visitFile [this p attrs]}
-    java.io.FileFilter {accept [this f]}
-    java.io.FilenameFilter {accept [this f s]}}))
+   {java.nio.file.FileVisitor {preVisitDirectory [[this p attrs]]
+                               postVisitDirectory [[this p attrs]]
+                               visitFile [[this p attrs]]}
+    java.io.FileFilter {accept [[this f]]}
+    java.io.FilenameFilter {accept [[this f s]]}
+    clojure.lang.ILookup {valAt [[this k] [this k default]]}
+    clojure.lang.IFn {applyTo [[this arglist]]
+                      invoke [[this]
+                              [this a1]
+                              [this a1 a2]
+                              [this a1 a2 a3]
+                              [this a1 a2 a3 a4]
+                              [this a1 a2 a3 a4 a5]
+                              [this a1 a2 a3 a4 a5 a6]
+                              [this a1 a2 a3 a4 a5 a6 a7]
+                              [this a1 a2 a3 a4 a5 a6 a7 a8]
+                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9]
+                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10]
+                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11]
+                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12]
+                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13]
+                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14]
+                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15]
+                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16]
+                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17]
+                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18]
+                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19]
+                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19 a20]
+                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19 a20 varargs]]}}))
diff --git a/test/babashka/main_test.clj b/test/babashka/main_test.clj
index 7ec984c9..6b7b4e1a 100644
--- a/test/babashka/main_test.clj
+++ b/test/babashka/main_test.clj
@@ -576,6 +576,36 @@
   (when test-utils/native?
     (is (bb nil "(defmethod print-method sci.lang.IVar [o w] (.write w (str :foo (symbol o)))) (def x 1) (= \":foouser/x\" (pr-str #'x))"))))
 
+(deftest reify-multiple-arities-test
+  (testing "ILookup"
+    (is (= ["->:foo" 10]
+           (bb nil "
+(def m (reify clojure.lang.ILookup
+  (valAt [this x] (str \"->\" x))
+  (valAt [this x y] y)))
+[(:foo m) (:foo m 10)]"))))
+  (testing "IFn"
+    (is (= [:yo :three :six :twelve :eighteen :nineteen 19]
+           (bb nil "
+(def m (reify clojure.lang.IFn
+  (invoke [this] :yo)
+  (invoke [this _ _ _] :three)
+  (invoke [this _ _ _ _ _ _] :six)
+  (invoke [this _ _ _ _ _ _ _ _ _ _ _ _] :twelve)
+  (invoke [this _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _] :eighteen)
+  (invoke [this _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _] :nineteen)
+  (applyTo [this args] (last args))))
+[
+(m)
+(m 1 2 3)
+(m 1 2 3 4 5 6)
+(m 1 2 3 4 5 6 1 2 3 4 5 6)
+(m 1 2 3 4 5 6 1 2 3 4 5 6 1 2 3 4 5 6)
+(m 1 2 3 4 5 6 1 2 3 4 5 6 1 2 3 4 5 6 1)
+(apply m (range 20))
+]")))))
+
+
 ;;;; Scratch
 
 (comment

From f5e2e73638357d409e16148dbadbaad5cf279050 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Feb 2021 18:25:50 +0100
Subject: [PATCH 016/145] v0.2.11

---
 CHANGELOG.md | 3 ++-
 fs           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26b2d1b5..29e9ef8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 For a list of breaking changes, check [here](#breaking-changes).
 
-## Unreleased
+## 0.2.11
 
 ### Enhancements / fixes
 
@@ -10,6 +10,7 @@ For a list of breaking changes, check [here](#breaking-changes).
 - Upgrade httpkit to 2.5.3 [#738](https://github.com/babashka/babashka/issues/738)
 - Upgrade tools.cli to 1.0.206
 - Add several classes to be used with `defprotocol` (`PersistentVector`, `PersistentHashSet`, ...)
+- Support reifying `clojure.lang.IFn` and `clojure.lang.ILookup`
 
 Sci:
 
diff --git a/fs b/fs
index caa1cb38..4022a1d6 160000
--- a/fs
+++ b/fs
@@ -1 +1 @@
-Subproject commit caa1cb383329c353114ae24954c52b9d6fa038ea
+Subproject commit 4022a1d67f2fa85823cd5b105290d02af8d6613e

From 937c2d1bd164a6c1b90834af37fa69d7a100cd79 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Feb 2021 18:27:26 +0100
Subject: [PATCH 017/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29e9ef8a..acec0f49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,7 @@ Sci:
 - Detect cyclic load dependencies [#531](https://github.com/babashka/babashka/issues/531)
 - Pick fn arity independent of written order [#532](https://github.com/babashka/babashka/issues/532) ([@GreshamDanielStephens](https://github.com/GreshamDanielStephens))
 - `(instance? clojure.lang.IAtom 1)` returns `true` [#537](https://github.com/borkdude/sci/issues/537)
-- Add `dissoc!`(@wilkerlucio)
+- Add `dissoc!`([@wilkerlucio](https://github.com/wilkerlucio))
 - Add `force`
 - Fix `ns-unmap` on referred var [#539](https://github.com/borkdude/sci/issues/539)
 

From 62207a101a4ffdef5c500295e0bf289b0656ad49 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Feb 2021 18:28:35 +0100
Subject: [PATCH 018/145] v0.2.11

---
 resources/BABASHKA_VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/BABASHKA_VERSION b/resources/BABASHKA_VERSION
index 1dc792c4..f8112ebd 100644
--- a/resources/BABASHKA_VERSION
+++ b/resources/BABASHKA_VERSION
@@ -1 +1 @@
-0.2.11-SNAPSHOT
\ No newline at end of file
+0.2.11
\ No newline at end of file

From 9b705eeeea9ca05158fe4cec5320ff801f5477d6 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Feb 2021 18:41:06 +0100
Subject: [PATCH 019/145] Version bump

---
 resources/BABASHKA_RELEASED_VERSION | 2 +-
 resources/BABASHKA_VERSION          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/BABASHKA_RELEASED_VERSION b/resources/BABASHKA_RELEASED_VERSION
index d156ab46..f8112ebd 100644
--- a/resources/BABASHKA_RELEASED_VERSION
+++ b/resources/BABASHKA_RELEASED_VERSION
@@ -1 +1 @@
-0.2.10
\ No newline at end of file
+0.2.11
\ No newline at end of file
diff --git a/resources/BABASHKA_VERSION b/resources/BABASHKA_VERSION
index f8112ebd..d72e6682 100644
--- a/resources/BABASHKA_VERSION
+++ b/resources/BABASHKA_VERSION
@@ -1 +1 @@
-0.2.11
\ No newline at end of file
+0.2.12-SNAPSHOT
\ No newline at end of file

From fbdbbcf1a9bc9d79a05e4487c1a73ce794f39dca Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Feb 2021 18:54:17 +0100
Subject: [PATCH 020/145] Attempt to fix Docker

---
 Dockerfile.alpine          | 2 +-
 resources/BABASHKA_VERSION | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 63cf4561..2d931ad0 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -14,7 +14,7 @@ RUN echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswit
 RUN bb -e "(curl/get \"https://httpstat.us/200\")" # cURL http test
 RUN bb -e "(require '[org.httpkit.client :as http]) (when-let [error (:error @(http/get \"https://httpstat.us/200\"))] (throw error))" # JVM http test
 RUN bb -e "(.length \"Hello, Babashka\")" # Java interop test
-RUN bb -e "(require '[babashka.pods :as pods]) (pods/load-pod 'org.babashka/sqlite3 \"0.0.1\") (require '[pod.babashka.sqlite3 :as sqlite]) (sqlite/execute! \"/tmp/foo.db\" [\"SELECT 1 + 1\"])" # Pod test
+RUN bb -e "(require '[babashka.pods :as pods]) (pods/load-pod 'org.babashka/go-sqlite3 \"0.0.1\") (require '[pod.babashka.go-sqlite3 :as sqlite]) (sqlite/execute! \"/tmp/foo.db\" [\"SELECT 1 + 1\"])" # Pod test
 
 
 FROM alpine:3
diff --git a/resources/BABASHKA_VERSION b/resources/BABASHKA_VERSION
index d72e6682..d3b5ba4b 100644
--- a/resources/BABASHKA_VERSION
+++ b/resources/BABASHKA_VERSION
@@ -1 +1 @@
-0.2.12-SNAPSHOT
\ No newline at end of file
+0.2.11

From 7c3ea37a00c22f5813dedeb84960e77c44aeb71d Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Feb 2021 19:11:05 +0100
Subject: [PATCH 021/145] Bump version again

---
 resources/BABASHKA_VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/BABASHKA_VERSION b/resources/BABASHKA_VERSION
index d3b5ba4b..b1ae539c 100644
--- a/resources/BABASHKA_VERSION
+++ b/resources/BABASHKA_VERSION
@@ -1 +1 @@
-0.2.11
+0.2.12-SNAPSHOT

From 0df893e0815f50b445715127b7241818b570950d Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Feb 2021 20:55:15 +0100
Subject: [PATCH 022/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 14 +++++++-------
 sci          |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index acec0f49..6f98a6e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,8 +14,8 @@ For a list of breaking changes, check [here](#breaking-changes).
 
 Sci:
 
-- Detect cyclic load dependencies [#531](https://github.com/babashka/babashka/issues/531)
-- Pick fn arity independent of written order [#532](https://github.com/babashka/babashka/issues/532) ([@GreshamDanielStephens](https://github.com/GreshamDanielStephens))
+- Detect cyclic load dependencies [#531](https://github.com/borkdude/sci/issues/531)
+- Pick fn arity independent of written order [#532](https://github.com/borkdude/sci/issues/532) ([@GreshamDanielStephens](https://github.com/GreshamDanielStephens))
 - `(instance? clojure.lang.IAtom 1)` returns `true` [#537](https://github.com/borkdude/sci/issues/537)
 - Add `dissoc!`([@wilkerlucio](https://github.com/wilkerlucio))
 - Add `force`
@@ -53,11 +53,11 @@ Babashka.nrepl:
 
 Sci:
 
-- Fix error reporting in case of arity error [#518](https://github.com/babashka/babashka/issues/518)
-- Shadowing record field names in protocol functions [#513](https://github.com/babashka/babashka/issues/513)
-- Fix destructuring in protocol method for record [#512](https://github.com/babashka/babashka/issues/512)
-- Faster processing of maps, sets and vectors [#482](https://github.com/babashka/babashka/issues/482)
-- Prioritize current namespace vars in syntax quote [#509](https://github.com/babashka/babashka/issues/509)
+- Fix error reporting in case of arity error [#518](https://github.com/borkdude/sci/issues/518)
+- Shadowing record field names in protocol functions [#513](https://github.com/borkdude/sci/issues/513)
+- Fix destructuring in protocol method for record [#512](https://github.com/borkdude/sci/issues/512)
+- Faster processing of maps, sets and vectors [#482](https://github.com/borkdude/sci/issues/482)
+- Prioritize current namespace vars in syntax quote [#509](https://github.com/borkdude/sci/issues/509)
 - Fix ns-publics to not include refers [#520](https://github.com/borkdude/sci/issues/520)
 - Add `refer-clojure` macro [#519](https://github.com/borkdude/sci/issues/519)
 
diff --git a/sci b/sci
index d174e28f..0d35c1ff 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit d174e28fcb05a53868404c7cd0efc43093b66442
+Subproject commit 0d35c1ffadb574afe3a130b5918dbf7dd19b2169

From d0431b8bb65b971db799ada3bb6c7ccc0fc543b6 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 1 Mar 2021 12:17:04 +0100
Subject: [PATCH 023/145] [#741] Fix cyclic dep problem with doric lib

---
 sci                                             |  2 +-
 .../lib_tests/babashka/run_all_libtests.clj     | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/sci b/sci
index 0d35c1ff..b74cdc1f 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit 0d35c1ffadb574afe3a130b5918dbf7dd19b2169
+Subproject commit b74cdc1f7f1e9a9136a7439b828f02f22251b901
diff --git a/test-resources/lib_tests/babashka/run_all_libtests.clj b/test-resources/lib_tests/babashka/run_all_libtests.clj
index 2bc95639..317ab5c7 100644
--- a/test-resources/lib_tests/babashka/run_all_libtests.clj
+++ b/test-resources/lib_tests/babashka/run_all_libtests.clj
@@ -6,10 +6,12 @@
 
 (def status (atom {}))
 
+(defn test-namespace? [ns]
+  (or (empty? ns-args)
+      (contains? ns-args ns)))
+
 (defn test-namespaces [& namespaces]
-  (let [namespaces (if (seq ns-args)
-                     (seq (keep ns-args namespaces))
-                     namespaces)]
+  (let [namespaces (seq (filter test-namespace? namespaces))]
     (when namespaces
       (doseq [ns namespaces]
         (require ns))
@@ -121,7 +123,14 @@
 
 ;;;; doric
 
-(test-namespaces 'doric.test.core)
+(defn test-doric-cyclic-dep-problem
+  []
+  (require '[doric.core :as d])
+  ((resolve 'doric.core/table) [:a :b] [{:a 1 :b 2}]))
+
+(when (test-namespace? 'doric.test.core)
+  (test-doric-cyclic-dep-problem)
+  (test-namespaces 'doric.test.core))
 
 ;;;; cljc-java-time
 

From 19115df8346a61f1b6e198f09527b11ad55a5734 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 1 Mar 2021 12:17:43 +0100
Subject: [PATCH 024/145] v0.2.12

---
 resources/BABASHKA_VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/BABASHKA_VERSION b/resources/BABASHKA_VERSION
index b1ae539c..25cd22b6 100644
--- a/resources/BABASHKA_VERSION
+++ b/resources/BABASHKA_VERSION
@@ -1 +1 @@
-0.2.12-SNAPSHOT
+0.2.12
\ No newline at end of file

From 2236203cbcf98f7395cecd0027722d8c71179151 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 1 Mar 2021 12:18:38 +0100
Subject: [PATCH 025/145] v0.2.12

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f98a6e3..4f223cb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 For a list of breaking changes, check [here](#breaking-changes).
 
+## 0.2.12
+
+### Enhancements / fixes
+
+- Fix false positive cyclic dep problem with doric lib [#741](https://github.com/babashka/babashka/issues/741)
+
 ## 0.2.11
 
 ### Enhancements / fixes

From f5d899bf6e91bdafd014260b79f4e1852885111e Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 1 Mar 2021 12:28:40 +0100
Subject: [PATCH 026/145] Version bump

---
 resources/BABASHKA_RELEASED_VERSION | 2 +-
 resources/BABASHKA_VERSION          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/BABASHKA_RELEASED_VERSION b/resources/BABASHKA_RELEASED_VERSION
index f8112ebd..25cd22b6 100644
--- a/resources/BABASHKA_RELEASED_VERSION
+++ b/resources/BABASHKA_RELEASED_VERSION
@@ -1 +1 @@
-0.2.11
\ No newline at end of file
+0.2.12
\ No newline at end of file
diff --git a/resources/BABASHKA_VERSION b/resources/BABASHKA_VERSION
index 25cd22b6..947c3a5c 100644
--- a/resources/BABASHKA_VERSION
+++ b/resources/BABASHKA_VERSION
@@ -1 +1 @@
-0.2.12
\ No newline at end of file
+0.2.13-SNAPSHOT
\ No newline at end of file

From f335716d1d24e2d2bf9c345ff773d985ad8f2a35 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 1 Mar 2021 23:54:47 +0100
Subject: [PATCH 027/145] fs: add regular-file?

---
 fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs b/fs
index 4022a1d6..5b8cf66c 160000
--- a/fs
+++ b/fs
@@ -1 +1 @@
-Subproject commit 4022a1d67f2fa85823cd5b105290d02af8d6613e
+Subproject commit 5b8cf66c4cc06bfc24615043c8f8c31f14321f2a

From 2eb27ae18387886d4b5488e6234c71fb54e95f8e Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Wed, 3 Mar 2021 12:00:41 +0100
Subject: [PATCH 028/145] [skip ci] projects.md

---
 doc/projects.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/projects.md b/doc/projects.md
index 271441c2..a0d746d4 100644
--- a/doc/projects.md
+++ b/doc/projects.md
@@ -34,6 +34,7 @@ The following libraries and projects are known to work with babashka.
     - [environ](#environ)
     - [gaka](#gaka)
     - [failjure](#failjure)
+    - [pretty](#pretty)
   - [Pods](#pods)
   - [Projects](#projects-1)
     - [babashka-test-action](#babashka-test-action)
@@ -450,6 +451,24 @@ Working with failed computations in Clojure.
 (f/fail "foo")
 ```
 
+### [pretty](https://github.com/AvisoNovate/pretty)
+
+The `io.aviso.ansi` namespace provides ANSI font and background color support.
+
+``` clojure
+(require '[babashka.deps :as deps])
+
+(deps/add-deps
+ '{:deps {io.aviso/pretty {:mvn/version "0.1.36"}}})
+
+(require '[io.aviso.ansi :as ansi])
+
+(println
+ (str "The following text will be "
+      ansi/bold-red-font "bold and red "
+      ansi/reset-font "but this text will not."))
+```
+
 ## Pods
 
 [Babashka pods](https://github.com/babashka/babashka.pods) are programs that can

From 7c380d0156e87414bdf721eec4d6bdb751b4eadf Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Wed, 3 Mar 2021 12:10:14 +0100
Subject: [PATCH 029/145] [skip ci] projects.md

---
 doc/projects.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/projects.md b/doc/projects.md
index a0d746d4..88d9c836 100644
--- a/doc/projects.md
+++ b/doc/projects.md
@@ -35,6 +35,7 @@ The following libraries and projects are known to work with babashka.
     - [gaka](#gaka)
     - [failjure](#failjure)
     - [pretty](#pretty)
+    - [clojure-term-colors](#clojure-term-colors)
   - [Pods](#pods)
   - [Projects](#projects-1)
     - [babashka-test-action](#babashka-test-action)
@@ -469,6 +470,24 @@ The `io.aviso.ansi` namespace provides ANSI font and background color support.
       ansi/reset-font "but this text will not."))
 ```
 
+### [clojure-term-colors](https://github.com/trhura/clojure-term-colors)
+
+Clojure ASCII color formatting for terminal output.
+
+``` clojure
+(require '[babashka.deps :as deps])
+
+(deps/add-deps
+ '{:deps {clojure-term-colors/clojure-term-colors {:mvn/version "0.1.0"}}})
+
+(require '[clojure.term.colors :as c])
+
+(println
+ (c/yellow "Yellow")
+ (c/red "Red")
+ "No color")
+```
+
 ## Pods
 
 [Babashka pods](https://github.com/babashka/babashka.pods) are programs that can

From bb3c95ea4ef48a2f52b6bd2ea0d8983bd932abec Mon Sep 17 00:00:00 2001
From: Kamil Toman <kamil.toman@gmail.com>
Date: Wed, 3 Mar 2021 13:49:14 +0100
Subject: [PATCH 030/145] Hint creating submodules using update --init in
 build.md [skip ci] (#745)

---
 doc/build.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/build.md b/doc/build.md
index b79f0dc4..78a2da8f 100644
--- a/doc/build.md
+++ b/doc/build.md
@@ -39,7 +39,7 @@ $ git clone https://github.com/babashka/babashka --recursive
 To update later on:
 
 ``` shellsession
-$ git submodule update --recursive
+$ git submodule update --init --recursive
 ```
 
 ## Build

From b3f90a81ce83263e58a54a636e8aceb1c86715a7 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Wed, 3 Mar 2021 23:08:34 +0100
Subject: [PATCH 031/145] NEWS [skip ci]

---
 doc/news.md | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/doc/news.md b/doc/news.md
index 1786d891..07d4e9ae 100644
--- a/doc/news.md
+++ b/doc/news.md
@@ -5,10 +5,18 @@ you have anything to add. Also see
 [#babashka](https://twitter.com/hashtag/babashka?src=hashtag_click&f=live) on
 Twitter.
 
+## 2021-03
+
+- A `python -m http.server` [replacement in babashka](https://gist.github.com/holyjak/36c6284c047ffb7573e8a34399de27d8)
+- A [PR](https://github.com/ring-clojure/ring-codec/issues/26) to make `ring-codec` compatible with babashka
+- The [stuartsierra/component](https://github.com/stuartsierra/component) library [seems to work with babashka](https://github.com/babashka/babashka/issues/742)
+
 ## 2021-02
 
-- Babashka 0.2.9 released
+- Babashka 0.2.9 - 0.2.12 released
 - [babashka.fs](https://github.com/babashka/fs): utility library for dealing with files (based on java.nio). Bundled with bb 0.2.9.
+- New [Youtube channel](https://www.youtube.com/channel/UCRCl_R1ihLJt7IOgICdb9Lw) with babashka related videos
+- MS SQL support for the [babashka sql pods](https://github.com/babashka/babashka-sql-pods/)
 
 - [Clojure like its PHP](https://eccentric-j.com/blog/clojure-like-its-php.html): run babashka scripts as CGI scripts
 - [Automating Video Edits with Clojure and ffmpeg](https://youtu.be/Tmgy57R9HZM) by Adam James
@@ -19,12 +27,21 @@ Twitter.
 lein imitation script built on deps.edn
 - [failjure](https://github.com/adambard/failjure) works with babashka.
 - A [script](https://gist.github.com/borkdude/58f099b2694d206e6eec18daedc5077b) to solve our mono-repo problem with deps.edn at work.
+- [Single-script vega-lite plotter](https://gist.github.com/vdikan/6b6063d6e1b00a3cd79bc7b3ce3853d6/)
+- [Find vars with the clj-kondo pod](https://gist.github.com/borkdude/841d85d5ad04c517337166b3928697bd). Also see [video](https://youtu.be/TvBmtGS0KJE).
+- [Another setup babashka Github action](https://github.com/marketplace/actions/setup-babashka)
+- [Babashka AWS Lambda
+- [AWS Lambda + babashka + minimal container image](https://gist.github.com/lukaszkorecki/a1fe27bf08f9b98e9def9da4bcb3264e)
+- [football script](https://gist.github.com/mmzsource/a732950aa43d19c5a9b63bbb7f20b7eb)
+- [ffclj](https://github.com/luissantos/ffclj): Clojure ffmpeg wrapper
+- [clj-lineart](https://github.com/eccentric-j/clj-lineart): Generative line art from a clojure-cgi script
+- [bunpack](https://github.com/robertfw/bunpack): remembers how to unpack things, so you don't have to
+- A script to download deps for [all `deps.edn` aliases](https://github.com/babashka/babashka/blob/master/examples/download-aliases.clj)
 
 ## 2021-01
 
-Babashka [0.2.8](https://github.com/babashka/babashka/blob/master/CHANGELOG.md#v028) released. This includes new libraries: hiccup, core.match and clojure.test.check.
-
-On 27th of February, Michiel (a.k.a. @borkdude) will do a talk about babashka at the [2021 GraalVM workshop](https://graalworkshop.github.io/2021/).
+- Babashka [0.2.8](https://github.com/babashka/babashka/blob/master/CHANGELOG.md#v028) released. This includes new libraries: hiccup, core.match and clojure.test.check.
+- On 27th of February, Michiel (a.k.a. @borkdude) will do a talk about babashka at the [2021 GraalVM workshop](https://graalworkshop.github.io/2021/).
 
 - First release of the [aws pod](https://github.com/babashka/pod-babashka-aws).
 - A [script](https://gist.github.com/borkdude/ba372c8cee311e31020b04063d88e1be) to print API breakage warnings.
@@ -38,16 +55,16 @@ On 27th of February, Michiel (a.k.a. @borkdude) will do a talk about babashka at
 
 ## 2020-12
 
-A new babashka talk: [Babashka and sci
+- A new babashka talk: [Babashka and sci
 internals](https://youtu.be/pgNp4Lk3gf0). Also see
 [slides](https://speakerdeck.com/babashka/babashka-and-sci-internals-at-london-clojurians-december-2020)
 and [REPL
 session](https://gist.github.com/borkdude/66a4d844668e12ae1a8277af10d6cc4b).
 
-Babashka 0.2.6 released. See [release
+- Babashka 0.2.6 released. See [release
 notes](https://github.com/babashka/babashka/blob/master/CHANGELOG.md#v026).
 
-Babashka 0.2.5 released. See [release
+- Babashka 0.2.5 released. See [release
 notes](https://github.com/babashka/babashka/blob/master/CHANGELOG.md#v025).
 
 - First release of the [sqlite pod](https://github.com/babashka/pod-babashka-sqlite3)

From 7fc14aaf08cada7a214b36efd763fdf4b74c35df Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Wed, 3 Mar 2021 23:12:20 +0100
Subject: [PATCH 032/145] NEWS [skip ci]

---
 doc/news.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/news.md b/doc/news.md
index 07d4e9ae..e950cb55 100644
--- a/doc/news.md
+++ b/doc/news.md
@@ -30,7 +30,6 @@ lein imitation script built on deps.edn
 - [Single-script vega-lite plotter](https://gist.github.com/vdikan/6b6063d6e1b00a3cd79bc7b3ce3853d6/)
 - [Find vars with the clj-kondo pod](https://gist.github.com/borkdude/841d85d5ad04c517337166b3928697bd). Also see [video](https://youtu.be/TvBmtGS0KJE).
 - [Another setup babashka Github action](https://github.com/marketplace/actions/setup-babashka)
-- [Babashka AWS Lambda
 - [AWS Lambda + babashka + minimal container image](https://gist.github.com/lukaszkorecki/a1fe27bf08f9b98e9def9da4bcb3264e)
 - [football script](https://gist.github.com/mmzsource/a732950aa43d19c5a9b63bbb7f20b7eb)
 - [ffclj](https://github.com/luissantos/ffclj): Clojure ffmpeg wrapper

From 45c2f23d42cec0a3baa150f746867b8ae11782c2 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Wed, 3 Mar 2021 23:38:08 +0100
Subject: [PATCH 033/145] babashka/fs#18

---
 fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs b/fs
index 5b8cf66c..56916713 160000
--- a/fs
+++ b/fs
@@ -1 +1 @@
-Subproject commit 5b8cf66c4cc06bfc24615043c8f8c31f14321f2a
+Subproject commit 56916713d4c08d9595799073cbb60772038d5e4a

From b81990cdee77500a0496b9ab91cd1a26219ed5ac Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Thu, 4 Mar 2021 10:38:34 +0100
Subject: [PATCH 034/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f223cb6..f9c0de42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 For a list of breaking changes, check [here](#breaking-changes).
 
+## Unreleased
+
+Babashka.fs:
+
+- Globbing is always recursive but should not be [#18](https://github.com/babashka/fs/issues/18)
+
 ## 0.2.12
 
 ### Enhancements / fixes

From 63b7ed3dab8f5900692f807f6104d67deaae109a Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Thu, 4 Mar 2021 10:49:16 +0100
Subject: [PATCH 035/145] Clean in first test step

---
 script/test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/test b/script/test
index 5ee24559..2d6317b9 100755
--- a/script/test
+++ b/script/test
@@ -14,7 +14,7 @@ unset BABASHKA_CLASSPATH
 unset BABASHKA_PRELOADS_TEST
 
 echo "running tests part 1"
-lein test "$@"
+lein "do" clean, test "$@"
 
 export BABASHKA_PRELOADS='(defn __bb__foo [] "foo") (defn __bb__bar [] "bar")'
 export BABASHKA_PRELOADS_TEST=true

From a3e133711147cc3e99060d65bbdefab577a8f5c7 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Fri, 5 Mar 2021 14:30:40 +0100
Subject: [PATCH 036/145] NEWS [skip ci]

---
 doc/news.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/news.md b/doc/news.md
index e950cb55..1cf80ec4 100644
--- a/doc/news.md
+++ b/doc/news.md
@@ -10,6 +10,7 @@ Twitter.
 - A `python -m http.server` [replacement in babashka](https://gist.github.com/holyjak/36c6284c047ffb7573e8a34399de27d8)
 - A [PR](https://github.com/ring-clojure/ring-codec/issues/26) to make `ring-codec` compatible with babashka
 - The [stuartsierra/component](https://github.com/stuartsierra/component) library [seems to work with babashka](https://github.com/babashka/babashka/issues/742)
+- [pathom3](https://pathom3.wsscode.com/docs/tutorials/babashka/) works with babashka!
 
 ## 2021-02
 

From ca7520b25d8ea326b909f51fef968a453a7f04a1 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 6 Mar 2021 11:09:28 +0100
Subject: [PATCH 037/145] sci: allow combinations of classes and protocols in
 reify

---
 sci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci b/sci
index b74cdc1f..09ae5985 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit b74cdc1f7f1e9a9136a7439b828f02f22251b901
+Subproject commit 09ae59857461ff1c5fd64c9757ee93f42aea49a9

From 0fae952d4d79283e5c99f53cc80bdccf17dec69e Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 6 Mar 2021 11:12:08 +0100
Subject: [PATCH 038/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 5 +++++
 sci          | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9c0de42..89dd1e2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ For a list of breaking changes, check [here](#breaking-changes).
 
 ## Unreleased
 
+Sci:
+
+- Allow combinations of interfaces and protocols in `reify` [#540](https://github.com/borkdude/sci/issues/540)
+  ([@GreshamDanielStephens](https://github.com/GreshamDanielStephens))
+
 Babashka.fs:
 
 - Globbing is always recursive but should not be [#18](https://github.com/babashka/fs/issues/18)
diff --git a/sci b/sci
index 09ae5985..076937ba 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit 09ae59857461ff1c5fd64c9757ee93f42aea49a9
+Subproject commit 076937baa88e774f02d50b967db29b0cdb0a3fb6

From 1391f028bf9fc6ebff481fbebb386bc55294b8f9 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 6 Mar 2021 11:17:39 +0100
Subject: [PATCH 039/145] sci: update to new reify config

---
 src/babashka/impl/reify.clj | 69 +++++++++++++++++++++++--------------
 1 file changed, 44 insertions(+), 25 deletions(-)

diff --git a/src/babashka/impl/reify.clj b/src/babashka/impl/reify.clj
index 57644f77..ceae6bcd 100644
--- a/src/babashka/impl/reify.clj
+++ b/src/babashka/impl/reify.clj
@@ -1,6 +1,7 @@
 (ns babashka.impl.reify
   {:no-doc true}
-  (:require [clojure.math.combinatorics :as combo]))
+  (:require [clojure.math.combinatorics :as combo]
+            [sci.impl.types]))
 
 (set! *warn-on-reflection* false)
 
@@ -8,33 +9,51 @@
   "Generates pre-compiled reify combinations"
   [methods]
   (let [subsets (rest (combo/subsets (seq methods)))]
-    (reduce (fn [opts classes]
-              (assoc opts
-                     (set (map (fn [[class _]]
-                                 (list 'quote class))
-                               classes))
-                     (list 'fn ['methods]
-                           (list* 'reify
-                                  (mapcat
-                                   (fn [[clazz methods]]
-                                     (cons clazz
-                                           (mapcat
-                                            (fn [[meth arities]]
-                                              (map
-                                               (fn [arity]
-                                                 (list meth arity
-                                                       (list*
-                                                        (list 'get-in 'methods
-                                                              [(list 'quote clazz) (list 'quote meth)])
-                                                        arity)))
-                                               arities))
-                                            methods)))
-                                   classes)))))
+    (reduce (fn [opts [classes protocols?]]
+              (let [prelude '[reify]
+                    prelude (if protocols?
+                              (conj prelude
+                                    'sci.impl.types.IReified
+                                    '(getInterfaces [this]
+                                                    interfaces)
+                                    '(getMethods [this]
+                                                 methods)
+                                    '(getProtocols [this]
+                                                   protocols))
+                              prelude)]
+                (assoc opts
+                       (cond-> (set (map #(list 'quote %)
+                                         (map first classes)))
+                         protocols?
+                         (conj (list 'quote 'sci.impl.types.IReified)))
+                       (list 'fn ['interfaces 'methods 'protocols]
+                             (concat prelude
+                                     (mapcat
+                                      (fn [[clazz methods]]
+                                        (cons clazz
+                                              (mapcat
+                                               (fn [[meth arities]]
+                                                 (map
+                                                  (fn [arity]
+                                                    (list meth arity
+                                                          (list*
+                                                           (list 'get 'methods (list 'quote meth))
+                                                           arity)))
+                                                  arities))
+                                               methods)))
+                                      classes))))))
             {}
-            subsets)))
+            (concat (map (fn [subset bool]
+                           [subset bool])
+                         subsets
+                         (repeat true))
+                    (map (fn [subset bool]
+                           [subset bool])
+                         subsets
+                         (repeat false))))))
 
 #_(prn (macroexpand '(gen-reify-combos
-                    {java.io.FileFilter {accept [[this f]]}})))
+                      {java.io.FileFilter {accept [[this f]]}})))
 
 #_:clj-kondo/ignore
 (def reify-opts

From 874593bae9cf6c05584364457f0d7bdcc63f1700 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 6 Mar 2021 16:02:41 +0100
Subject: [PATCH 040/145] Add clojure.lang.Associative

---
 src/babashka/impl/classes.clj | 3 ++-
 src/babashka/impl/reify.clj   | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/babashka/impl/classes.clj b/src/babashka/impl/classes.clj
index 260f15a8..c1eb8feb 100644
--- a/src/babashka/impl/classes.clj
+++ b/src/babashka/impl/classes.clj
@@ -249,7 +249,8 @@
     :methods [borkdude.graal.LockFix] ;; support for locking
 
     :fields [clojure.lang.PersistentQueue]
-    :instance-checks [clojure.lang.Atom
+    :instance-checks [clojure.lang.Associative
+                      clojure.lang.Atom
                       clojure.lang.Cons
                       clojure.lang.Cycle
                       clojure.lang.IObj
diff --git a/src/babashka/impl/reify.clj b/src/babashka/impl/reify.clj
index ceae6bcd..b5718e3b 100644
--- a/src/babashka/impl/reify.clj
+++ b/src/babashka/impl/reify.clj
@@ -86,4 +86,7 @@
                               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18]
                               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19]
                               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19 a20]
-                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19 a20 varargs]]}}))
+                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19 a20 varargs]]}
+    clojure.lang.Associative {containsKey [[this k]]
+                              entryAt [[this k]]
+                              assoc [[this k v]]}}))

From d72aa3158a8735019e6533015750fe6c52e1b86c Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 7 Mar 2021 11:43:35 +0100
Subject: [PATCH 041/145] sci#540: one reify to rule them all

---
 sci                         |  2 +-
 src/babashka/impl/reify.clj | 71 +++++++++++++------------------------
 src/babashka/main.clj       |  4 +--
 3 files changed, 27 insertions(+), 50 deletions(-)

diff --git a/sci b/sci
index 076937ba..7e79c5e4 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit 076937baa88e774f02d50b967db29b0cdb0a3fb6
+Subproject commit 7e79c5e4717debbcef39bf972b75475b45facb8d
diff --git a/src/babashka/impl/reify.clj b/src/babashka/impl/reify.clj
index b5718e3b..016ab84a 100644
--- a/src/babashka/impl/reify.clj
+++ b/src/babashka/impl/reify.clj
@@ -8,55 +8,32 @@
 (defmacro gen-reify-combos
   "Generates pre-compiled reify combinations"
   [methods]
-  (let [subsets (rest (combo/subsets (seq methods)))]
-    (reduce (fn [opts [classes protocols?]]
-              (let [prelude '[reify]
-                    prelude (if protocols?
-                              (conj prelude
-                                    'sci.impl.types.IReified
-                                    '(getInterfaces [this]
-                                                    interfaces)
-                                    '(getMethods [this]
-                                                 methods)
-                                    '(getProtocols [this]
-                                                   protocols))
-                              prelude)]
-                (assoc opts
-                       (cond-> (set (map #(list 'quote %)
-                                         (map first classes)))
-                         protocols?
-                         (conj (list 'quote 'sci.impl.types.IReified)))
-                       (list 'fn ['interfaces 'methods 'protocols]
-                             (concat prelude
-                                     (mapcat
-                                      (fn [[clazz methods]]
-                                        (cons clazz
-                                              (mapcat
-                                               (fn [[meth arities]]
-                                                 (map
-                                                  (fn [arity]
-                                                    (list meth arity
-                                                          (list*
-                                                           (list 'get 'methods (list 'quote meth))
-                                                           arity)))
-                                                  arities))
-                                               methods)))
-                                      classes))))))
-            {}
-            (concat (map (fn [subset bool]
-                           [subset bool])
-                         subsets
-                         (repeat true))
-                    (map (fn [subset bool]
-                           [subset bool])
-                         subsets
-                         (repeat false))))))
-
-#_(prn (macroexpand '(gen-reify-combos
-                      {java.io.FileFilter {accept [[this f]]}})))
+  (let [prelude ['reify
+                 'sci.impl.types.IReified
+                 '(getInterfaces [this]
+                                 interfaces)
+                 '(getMethods [this]
+                              methods)
+                 '(getProtocols [this]
+                                protocols)]]
+    (list 'fn ['interfaces 'methods 'protocols]
+          (concat prelude
+                  (mapcat (fn [[clazz methods]]
+                            (cons clazz
+                                  (mapcat
+                                   (fn [[meth arities]]
+                                     (map
+                                      (fn [arity]
+                                        (list meth arity
+                                              (list*
+                                               (list 'get 'methods (list 'quote meth))
+                                               arity)))
+                                      arities))
+                                   methods)))
+                          methods)))))
 
 #_:clj-kondo/ignore
-(def reify-opts
+(def reify-fn
   (gen-reify-combos
    {java.nio.file.FileVisitor {preVisitDirectory [[this p attrs]]
                                postVisitDirectory [[this p attrs]]
diff --git a/src/babashka/main.clj b/src/babashka/main.clj
index fbe391a8..ad1aa25a 100644
--- a/src/babashka/main.clj
+++ b/src/babashka/main.clj
@@ -26,7 +26,7 @@
    [babashka.impl.pprint :refer [pprint-namespace]]
    [babashka.impl.process :refer [process-namespace]]
    [babashka.impl.protocols :refer [protocols-namespace]]
-   [babashka.impl.reify :refer [reify-opts]]
+   [babashka.impl.reify :refer [reify-fn]]
    [babashka.impl.repl :as repl]
    [babashka.impl.socket-repl :as socket-repl]
    [babashka.impl.test :as t]
@@ -569,7 +569,7 @@ Use -- to separate script command line args from bb command line args.
                   :load-fn load-fn
                   :uberscript uberscript
                   :readers core/data-readers
-                  :reify reify-opts}
+                  :reify-fn reify-fn}
             opts (addons/future opts)
             sci-ctx (sci/init opts)
             _ (vreset! common/ctx sci-ctx)

From bc8739a57e4217456af8db3ce428dc9f4f87bc13 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 7 Mar 2021 12:34:01 +0100
Subject: [PATCH 042/145] sci: reify

---
 sci                         | 2 +-
 src/babashka/impl/reify.clj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci b/sci
index 7e79c5e4..9843e552 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit 7e79c5e4717debbcef39bf972b75475b45facb8d
+Subproject commit 9843e5521f65574d4c5c49a4fccfd920e28c8a62
diff --git a/src/babashka/impl/reify.clj b/src/babashka/impl/reify.clj
index 016ab84a..38020d3a 100644
--- a/src/babashka/impl/reify.clj
+++ b/src/babashka/impl/reify.clj
@@ -16,7 +16,7 @@
                               methods)
                  '(getProtocols [this]
                                 protocols)]]
-    (list 'fn ['interfaces 'methods 'protocols]
+    (list 'fn [{:keys '[interfaces methods protocols]}]
           (concat prelude
                   (mapcat (fn [[clazz methods]]
                             (cons clazz

From 0d59c0f43bc98183228cab6ebaa7f538652299b0 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 7 Mar 2021 13:56:12 +0100
Subject: [PATCH 043/145] Reify improvements

---
 deps.edn                     |  3 +-
 project.clj                  |  3 +-
 sci                          |  2 +-
 src/babashka/impl/reify.clj  | 50 +++++++++++++-----------
 test/babashka/main_test.clj  | 41 +-------------------
 test/babashka/reify_test.clj | 73 ++++++++++++++++++++++++++++++++++++
 6 files changed, 106 insertions(+), 66 deletions(-)
 create mode 100644 test/babashka/reify_test.clj

diff --git a/deps.edn b/deps.edn
index c47e1d5c..2e51bc26 100644
--- a/deps.edn
+++ b/deps.edn
@@ -32,10 +32,9 @@
         datascript/datascript {:mvn/version "1.0.1"}
         http-kit/http-kit {:mvn/version "2.5.3"}
         babashka/clojure-lanterna {:mvn/version "0.9.8-SNAPSHOT"}
-        org.clojure/math.combinatorics {:mvn/version "0.1.6"}
         org.clojure/core.match {:mvn/version "1.0.0"}
         hiccup/hiccup {:mvn/version "2.0.0-alpha2"}}
- :aliases {:main
+ :aliases {:babashka/dev
            {:main-opts ["-m" "babashka.main"]}
            :profile
            {:extra-deps
diff --git a/project.clj b/project.clj
index 0bb8fa1a..0347a567 100644
--- a/project.clj
+++ b/project.clj
@@ -21,8 +21,7 @@
                  [cheshire "5.10.0"]
                  [nrepl/bencode "1.1.0"]
                  [borkdude/sci.impl.reflector "0.0.1"]
-                 [org.clojure/test.check "1.1.0"]
-                 [org.clojure/math.combinatorics "0.1.6"]]
+                 [org.clojure/test.check "1.1.0"]]
   :profiles {:feature/xml  {:source-paths ["feature-xml"]
                             :dependencies [[org.clojure/data.xml "0.2.0-alpha6"]]}
              :feature/yaml {:source-paths ["feature-yaml"]
diff --git a/sci b/sci
index 9843e552..5912a2b6 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit 9843e5521f65574d4c5c49a4fccfd920e28c8a62
+Subproject commit 5912a2b6d12d3a6c46f903383c61b784cddbc174
diff --git a/src/babashka/impl/reify.clj b/src/babashka/impl/reify.clj
index 38020d3a..74a72248 100644
--- a/src/babashka/impl/reify.clj
+++ b/src/babashka/impl/reify.clj
@@ -1,7 +1,6 @@
 (ns babashka.impl.reify
   {:no-doc true}
-  (:require [clojure.math.combinatorics :as combo]
-            [sci.impl.types]))
+  (:require [sci.impl.types]))
 
 (set! *warn-on-reflection* false)
 
@@ -15,31 +14,38 @@
                  '(getMethods [this]
                               methods)
                  '(getProtocols [this]
-                                protocols)]]
+                                protocols)
+                 'java.lang.Object
+                 '(toString [this]
+                            (if-let [m (get methods 'toString)]
+                              (m this)
+                              (str (.. this getClass getName)
+                                   "@" (Integer/toHexString (.hashCode this)))))]]
     (list 'fn [{:keys '[interfaces methods protocols]}]
           (concat prelude
                   (mapcat (fn [[clazz methods]]
-                            (cons clazz
-                                  (mapcat
-                                   (fn [[meth arities]]
-                                     (map
-                                      (fn [arity]
-                                        (list meth arity
-                                              (list*
-                                               (list 'get 'methods (list 'quote meth))
-                                               arity)))
-                                      arities))
+                            (cons
+                             clazz
+                             (mapcat
+                              (fn [[meth arities]]
+                                (map
+                                 (fn [arity]
+                                   (list meth arity
+                                         (list*
+                                          (list 'or (list 'get 'methods (list 'quote meth))
+                                                `(throw (new Exception (str "Not implemented: "
+                                                                            ~(str meth)))))
+                                          arity)))
+                                 arities))
                                    methods)))
                           methods)))))
 
 #_:clj-kondo/ignore
 (def reify-fn
   (gen-reify-combos
-   {java.nio.file.FileVisitor {preVisitDirectory [[this p attrs]]
-                               postVisitDirectory [[this p attrs]]
-                               visitFile [[this p attrs]]}
-    java.io.FileFilter {accept [[this f]]}
-    java.io.FilenameFilter {accept [[this f s]]}
+   {clojure.lang.Associative {containsKey [[this k]]
+                              entryAt [[this k]]
+                              assoc [[this k v]]}
     clojure.lang.ILookup {valAt [[this k] [this k default]]}
     clojure.lang.IFn {applyTo [[this arglist]]
                       invoke [[this]
@@ -64,6 +70,8 @@
                               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19]
                               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19 a20]
                               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19 a20 varargs]]}
-    clojure.lang.Associative {containsKey [[this k]]
-                              entryAt [[this k]]
-                              assoc [[this k v]]}}))
+    java.nio.file.FileVisitor {preVisitDirectory [[this p attrs]]
+                               postVisitDirectory [[this p attrs]]
+                               visitFile [[this p attrs]]}
+    java.io.FileFilter {accept [[this f]]}
+    java.io.FilenameFilter {accept [[this f s]]}}))
diff --git a/test/babashka/main_test.clj b/test/babashka/main_test.clj
index 6b7b4e1a..165601be 100644
--- a/test/babashka/main_test.clj
+++ b/test/babashka/main_test.clj
@@ -363,16 +363,7 @@
     (is (.exists f2))
     (let [v (bb nil "-f" (.getPath (io/file "test-resources" "babashka" "glob.clj")))]
       (is (vector? v))
-      (is (.exists (io/file (first v))))))
-  (testing "reify can handle multiple classes at once"
-    (is (true? (bb nil "
-(def filter-obj (reify java.io.FileFilter
-                  (accept [this f] (prn (.getPath f)) true)
-                  java.io.FilenameFilter
-                  (accept [this f name] (prn name) true)))
-(def s1 (with-out-str (.listFiles (clojure.java.io/file \".\") filter-obj)))
-(def s2 (with-out-str (.list (clojure.java.io/file \".\") filter-obj)))
-(and (pos? (count s1)) (pos? (count s2)))")))))
+      (is (.exists (io/file (first v)))))))
 
 (deftest future-print-test
   (testing "the root binding of sci/*out*"
@@ -576,36 +567,6 @@
   (when test-utils/native?
     (is (bb nil "(defmethod print-method sci.lang.IVar [o w] (.write w (str :foo (symbol o)))) (def x 1) (= \":foouser/x\" (pr-str #'x))"))))
 
-(deftest reify-multiple-arities-test
-  (testing "ILookup"
-    (is (= ["->:foo" 10]
-           (bb nil "
-(def m (reify clojure.lang.ILookup
-  (valAt [this x] (str \"->\" x))
-  (valAt [this x y] y)))
-[(:foo m) (:foo m 10)]"))))
-  (testing "IFn"
-    (is (= [:yo :three :six :twelve :eighteen :nineteen 19]
-           (bb nil "
-(def m (reify clojure.lang.IFn
-  (invoke [this] :yo)
-  (invoke [this _ _ _] :three)
-  (invoke [this _ _ _ _ _ _] :six)
-  (invoke [this _ _ _ _ _ _ _ _ _ _ _ _] :twelve)
-  (invoke [this _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _] :eighteen)
-  (invoke [this _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _] :nineteen)
-  (applyTo [this args] (last args))))
-[
-(m)
-(m 1 2 3)
-(m 1 2 3 4 5 6)
-(m 1 2 3 4 5 6 1 2 3 4 5 6)
-(m 1 2 3 4 5 6 1 2 3 4 5 6 1 2 3 4 5 6)
-(m 1 2 3 4 5 6 1 2 3 4 5 6 1 2 3 4 5 6 1)
-(apply m (range 20))
-]")))))
-
-
 ;;;; Scratch
 
 (comment
diff --git a/test/babashka/reify_test.clj b/test/babashka/reify_test.clj
new file mode 100644
index 00000000..5cc24b1e
--- /dev/null
+++ b/test/babashka/reify_test.clj
@@ -0,0 +1,73 @@
+(ns babashka.reify-test
+  (:require
+   [babashka.test-utils :as test-utils]
+   [clojure.edn :as edn]
+   [clojure.test :as test :refer [deftest is testing]]
+   [clojure.string :as str]))
+
+(defn bb [input & args]
+  (edn/read-string
+   {:readers *data-readers*
+    :eof nil}
+   (apply test-utils/bb (when (some? input) (str input)) (map str args))))
+
+(deftest file-filter-test
+  (testing "reify can handle multiple classes at once"
+    (is (true? (bb nil "
+(def filter-obj (reify java.io.FileFilter
+                  (accept [this f] (prn (.getPath f)) true)
+                  java.io.FilenameFilter
+                  (accept [this f name] (prn name) true)))
+(def s1 (with-out-str (.listFiles (clojure.java.io/file \".\") filter-obj)))
+(def s2 (with-out-str (.list (clojure.java.io/file \".\") filter-obj)))
+(and (pos? (count s1)) (pos? (count s2)))")))))
+
+(deftest reify-multiple-arities-test
+  (testing "ILookup"
+    (is (= ["->:foo" 10]
+           (bb nil "
+(def m (reify clojure.lang.ILookup
+  (valAt [this x] (str \"->\" x))
+  (valAt [this x y] y)))
+[(:foo m) (:foo m 10)]"))))
+  (testing "IFn"
+    (is (= [:yo :three :six :twelve :eighteen :nineteen 19]
+           (bb nil "
+(def m (reify clojure.lang.IFn
+  (invoke [this] :yo)
+  (invoke [this _ _ _] :three)
+  (invoke [this _ _ _ _ _ _] :six)
+  (invoke [this _ _ _ _ _ _ _ _ _ _ _ _] :twelve)
+  (invoke [this _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _] :eighteen)
+  (invoke [this _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _] :nineteen)
+  (applyTo [this args] (last args))))
+[
+(m)
+(m 1 2 3)
+(m 1 2 3 4 5 6)
+(m 1 2 3 4 5 6 1 2 3 4 5 6)
+(m 1 2 3 4 5 6 1 2 3 4 5 6 1 2 3 4 5 6)
+(m 1 2 3 4 5 6 1 2 3 4 5 6 1 2 3 4 5 6 1)
+(apply m (range 20))
+]")))))
+
+(deftest reify-object
+  (testing "toString"
+    (is (= ":foo"
+           (bb nil "
+(def m (reify Object
+  (toString [_] (str :foo))))
+(str m)
+"))))
+  (testing "Hashcode still works when only overriding toString"
+    (is (number?
+         (bb nil "
+(def m (reify Object
+  (toString [_] (str :foo))))
+(hash m)
+"))))
+  (testing "toString still works when not overriding it"
+    (is (bb nil "
+(def m (reify Object))
+(str m)
+"))))

From fcb2554ff3e26dbb0ca0fd7992d2df68d62387d3 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 8 Mar 2021 10:46:38 +0100
Subject: [PATCH 044/145] CHANGELOG [skip ci]

---
 CHANGELOG.md             | 7 +++----
 fs                       | 2 +-
 sci                      | 2 +-
 src/babashka/impl/fs.clj | 4 ++++
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89dd1e2f..1d3b3460 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,9 @@ Sci:
 
 Babashka.fs:
 
+- Add `create-link` and `split-paths` ([@eamonnsullivan](https://github.com/eamonnsullivan))
+- Add `split-ext` and `extension` ([@kiramclean](https://github.com/kiramclean))
+- Add `regular-file?`([@tekacs](https://github.com/tekacs))
 - Globbing is always recursive but should not be [#18](https://github.com/babashka/fs/issues/18)
 
 ## 0.2.12
@@ -38,10 +41,6 @@ Sci:
 - Add `force`
 - Fix `ns-unmap` on referred var [#539](https://github.com/borkdude/sci/issues/539)
 
-Babashka.fs:
-
-- Add `create-link` and `split-paths`
-
 Babashka.nrepl:
 
 - Fix printing in lazy value [#36](https://github.com/babashka/babashka.nrepl/issues/36)
diff --git a/fs b/fs
index 56916713..1c3fcabe 160000
--- a/fs
+++ b/fs
@@ -1 +1 @@
-Subproject commit 56916713d4c08d9595799073cbb60772038d5e4a
+Subproject commit 1c3fcabec28d6d07bb59431fde76592a7fca6338
diff --git a/sci b/sci
index 5912a2b6..7f18ce95 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit 5912a2b6d12d3a6c46f903383c61b784cddbc174
+Subproject commit 7f18ce95cae1e78a851726cba8ed5a267f248d86
diff --git a/src/babashka/impl/fs.clj b/src/babashka/impl/fs.clj
index 034738e6..996a55a6 100644
--- a/src/babashka/impl/fs.clj
+++ b/src/babashka/impl/fs.clj
@@ -25,6 +25,7 @@
    'create-dir (sci/copy-var fs/create-dir fns)
    'create-dirs (sci/copy-var fs/create-dirs fns)
    'create-file (sci/copy-var fs/create-file fns)
+   'create-link (sci/copy-var fs/create-link fns)
    'create-sym-link (sci/copy-var fs/create-sym-link fns)
    'create-temp-dir (sci/copy-var fs/create-temp-dir fns)
    'creation-time (sci/copy-var fs/creation-time fns)
@@ -37,6 +38,7 @@
    'exec-paths (sci/copy-var fs/exec-paths fns)
    'executable? (sci/copy-var fs/executable? fns)
    'exists? (sci/copy-var fs/exists? fns)
+   'extension (sci/copy-var fs/extension fns)
    'file (sci/copy-var fs/file fns)
    'file-name (sci/copy-var fs/file-name fns)
    'file-separator (sci/copy-var fs/file-separator fns)
@@ -62,6 +64,7 @@
    'read-attributes (sci/copy-var fs/read-attributes fns)
    'readable? (sci/copy-var fs/readable? fns)
    'real-path (sci/copy-var fs/real-path fns)
+   'regular-file? (sci/copy-var fs/regular-file? fns)
    'relative? (sci/copy-var fs/relative? fns)
    'relativize (sci/copy-var fs/relativize fns)
    'same-file? (sci/copy-var fs/same-file? fns)
@@ -70,6 +73,7 @@
    'set-last-modified-time (sci/copy-var fs/set-last-modified-time fns)
    'set-posix-file-permissions (sci/copy-var fs/set-posix-file-permissions fns)
    'size (sci/copy-var fs/size fns)
+   'split-ext (sci/copy-var fs/split-ext fns)
    'split-paths (sci/copy-var fs/split-paths fns)
    'starts-with? (sci/copy-var fs/starts-with? fns)
    'str->posix (sci/copy-var fs/str->posix fns)

From 8235ec7afdcce387c9328ba4ab986f557f7226eb Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 8 Mar 2021 10:49:01 +0100
Subject: [PATCH 045/145] CHANGELOG [skip ci]

---
 fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs b/fs
index 1c3fcabe..f4e614b3 160000
--- a/fs
+++ b/fs
@@ -1 +1 @@
-Subproject commit 1c3fcabec28d6d07bb59431fde76592a7fca6338
+Subproject commit f4e614b3c9067bcff29deb6bd7dcc0d2a02383d7

From 2d91171dd9e52ee96fbd4ded6cae7b16d2dfd2d2 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 8 Mar 2021 11:19:07 +0100
Subject: [PATCH 046/145] sci: master branch

---
 sci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci b/sci
index 7f18ce95..5912a2b6 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit 7f18ce95cae1e78a851726cba8ed5a267f248d86
+Subproject commit 5912a2b6d12d3a6c46f903383c61b784cddbc174

From c6c1be0fa1a2f771905e91b36c6a87458107e8b3 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 8 Mar 2021 20:43:01 +0100
Subject: [PATCH 047/145] babashka.curl#35

---
 CHANGELOG.md  | 11 ++++++++---
 babashka.curl |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d3b3460..438c24c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,10 @@ For a list of breaking changes, check [here](#breaking-changes).
 
 ## Unreleased
 
-Sci:
+Babashka.curl:
 
-- Allow combinations of interfaces and protocols in `reify` [#540](https://github.com/borkdude/sci/issues/540)
-  ([@GreshamDanielStephens](https://github.com/GreshamDanielStephens))
+- [#35](https://github.com/babashka/babashka.curl/issues/35): use
+  `--data-binary` when sending files or streams
 
 Babashka.fs:
 
@@ -16,6 +16,11 @@ Babashka.fs:
 - Add `regular-file?`([@tekacs](https://github.com/tekacs))
 - Globbing is always recursive but should not be [#18](https://github.com/babashka/fs/issues/18)
 
+Sci:
+
+- Allow combinations of interfaces and protocols in `reify` [#540](https://github.com/borkdude/sci/issues/540)
+  ([@GreshamDanielStephens](https://github.com/GreshamDanielStephens))
+
 ## 0.2.12
 
 ### Enhancements / fixes
diff --git a/babashka.curl b/babashka.curl
index 33bfad1b..30f48f29 160000
--- a/babashka.curl
+++ b/babashka.curl
@@ -1 +1 @@
-Subproject commit 33bfad1b844927966a2a681d3e73e4d2a8eae54b
+Subproject commit 30f48f29b1698a9fd1639c8f9781b37e7415de78

From 515a78f97988f4ff77b2773a8847e4efb61399de Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 8 Mar 2021 21:12:12 +0100
Subject: [PATCH 048/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 438c24c6..ced09e30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@ For a list of breaking changes, check [here](#breaking-changes).
 
 ## Unreleased
 
+<!--
+
+TODO:
+
+Check --data-binary with string POST data, e.g. JSON with weird chars...
+
+-->
+
 Babashka.curl:
 
 - [#35](https://github.com/babashka/babashka.curl/issues/35): use

From 9e1cb2f9de1053334c370cb71da1b6f5368c3283 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 8 Mar 2021 22:21:38 +0100
Subject: [PATCH 049/145] babashka.curl#35

---
 babashka.curl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babashka.curl b/babashka.curl
index 30f48f29..e1f33ffa 160000
--- a/babashka.curl
+++ b/babashka.curl
@@ -1 +1 @@
-Subproject commit 30f48f29b1698a9fd1639c8f9781b37e7415de78
+Subproject commit e1f33ffa22728553bf2242db5e2a4ca349fab04b

From 2ad4d3342c3d2de89e359569d43579e25191fcab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wilker=20L=C3=BAcio?= <wilkerlucio@users.noreply.github.com>
Date: Mon, 8 Mar 2021 18:58:43 -0300
Subject: [PATCH 050/145] Map type extensions (#749)

---
 src/babashka/impl/classes.clj |  11 +++-
 src/babashka/impl/reify.clj   | 115 ++++++++++++++++++++++++----------
 2 files changed, 93 insertions(+), 33 deletions(-)

diff --git a/src/babashka/impl/classes.clj b/src/babashka/impl/classes.clj
index c1eb8feb..7b84c2a6 100644
--- a/src/babashka/impl/classes.clj
+++ b/src/babashka/impl/classes.clj
@@ -252,6 +252,7 @@
     :instance-checks [clojure.lang.Associative
                       clojure.lang.Atom
                       clojure.lang.Cons
+                      clojure.lang.Counted
                       clojure.lang.Cycle
                       clojure.lang.IObj
                       clojure.lang.Fn ;; to distinguish fns from maps, etc.
@@ -261,14 +262,20 @@
                       ;; clojure.lang.IAtom  ;; implemented as protocol in sci
                       clojure.lang.IEditableCollection
                       clojure.lang.IMapEntry
+                      clojure.lang.IMeta
                       clojure.lang.ILookup
                       clojure.lang.IPersistentCollection
                       clojure.lang.IPersistentMap
                       clojure.lang.IPersistentSet
+                      clojure.lang.IPersistentStack
                       clojure.lang.IPersistentVector
                       clojure.lang.IRecord
+                      clojure.lang.IReduce
+                      clojure.lang.IReduceInit
+                      clojure.lang.IKVReduce
                       clojure.lang.IRef
                       clojure.lang.ISeq
+                      clojure.lang.Indexed
                       clojure.lang.Iterate
                       clojure.lang.LazySeq
                       clojure.lang.Named
@@ -284,11 +291,13 @@
                       clojure.lang.PersistentVector
                       clojure.lang.Ratio
                       clojure.lang.Repeat
+                      clojure.lang.Reversible
                       clojure.lang.Symbol
                       clojure.lang.Sequential
                       clojure.lang.Seqable
                       clojure.lang.Volatile
-                      java.util.List]
+                      java.util.List
+                      java.util.Iterator]
     :custom ~custom-map})
 
 (defmacro gen-class-map []
diff --git a/src/babashka/impl/reify.clj b/src/babashka/impl/reify.clj
index 74a72248..fa008737 100644
--- a/src/babashka/impl/reify.clj
+++ b/src/babashka/impl/reify.clj
@@ -43,35 +43,86 @@
 #_:clj-kondo/ignore
 (def reify-fn
   (gen-reify-combos
-   {clojure.lang.Associative {containsKey [[this k]]
-                              entryAt [[this k]]
-                              assoc [[this k v]]}
-    clojure.lang.ILookup {valAt [[this k] [this k default]]}
-    clojure.lang.IFn {applyTo [[this arglist]]
-                      invoke [[this]
-                              [this a1]
-                              [this a1 a2]
-                              [this a1 a2 a3]
-                              [this a1 a2 a3 a4]
-                              [this a1 a2 a3 a4 a5]
-                              [this a1 a2 a3 a4 a5 a6]
-                              [this a1 a2 a3 a4 a5 a6 a7]
-                              [this a1 a2 a3 a4 a5 a6 a7 a8]
-                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9]
-                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10]
-                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11]
-                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12]
-                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13]
-                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14]
-                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15]
-                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16]
-                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17]
-                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18]
-                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19]
-                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19 a20]
-                              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19 a20 varargs]]}
-    java.nio.file.FileVisitor {preVisitDirectory [[this p attrs]]
-                               postVisitDirectory [[this p attrs]]
-                               visitFile [[this p attrs]]}
-    java.io.FileFilter {accept [[this f]]}
-    java.io.FilenameFilter {accept [[this f s]]}}))
+    {java.nio.file.FileVisitor
+     {preVisitDirectory  [[this p attrs]]
+      postVisitDirectory [[this p attrs]]
+      visitFile          [[this p attrs]]}
+
+     java.io.FileFilter
+     {accept [[this f]]}
+
+     java.io.FilenameFilter
+     {accept [[this f s]]}
+
+     clojure.lang.Associative
+     {containsKey [[this k]]
+      entryAt     [[this k]]
+      assoc       [[this k v]]}
+
+     clojure.lang.ILookup
+     {valAt [[this k] [this k default]]}
+
+     clojure.lang.IFn
+     {applyTo [[this arglist]]
+      invoke  [[this]
+               [this a1]
+               [this a1 a2]
+               [this a1 a2 a3]
+               [this a1 a2 a3 a4]
+               [this a1 a2 a3 a4 a5]
+               [this a1 a2 a3 a4 a5 a6]
+               [this a1 a2 a3 a4 a5 a6 a7]
+               [this a1 a2 a3 a4 a5 a6 a7 a8]
+               [this a1 a2 a3 a4 a5 a6 a7 a8 a9]
+               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10]
+               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11]
+               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12]
+               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13]
+               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14]
+               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15]
+               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16]
+               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17]
+               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18]
+               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19]
+               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19 a20]
+               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19 a20 varargs]]}
+
+     clojure.lang.IPersistentCollection
+     {count [[this]]
+      cons  [[this x]]
+      empty [[this]]
+      equiv [[this x]]}
+
+     clojure.lang.IReduce
+     {reduce [[this f]]}
+
+     clojure.lang.IReduceInit
+     {reduce [[this f initial]]}
+
+     clojure.lang.IKVReduce
+     {kvreduce [[this f initial]]}
+
+     clojure.lang.Indexed
+     {nth [[this n] [this n not-found]]}
+
+     clojure.lang.IPersistentMap
+     {assocEx [[this k v]]
+      without [[this k]]}
+
+     clojure.lang.IPersistentStack
+     {peek [[this]]
+      pop  [[this]]}
+
+     clojure.lang.Reversible
+     {rseq [[this]]}
+
+     clojure.lang.Seqable
+     {seq [[this]]}
+
+     java.lang.Iterable
+     {iterator [[this]]
+      forEach  [[this action]]}
+
+     java.util.Iterator
+     {hasNext [[this]]
+      next    [[this]]}}))

From 169f26e2b138d8aca50d9578e6badfbcfa51171a Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 8 Mar 2021 23:27:47 +0100
Subject: [PATCH 051/145] sci#546

---
 CHANGELOG.md | 9 +--------
 sci          | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ced09e30..7c6ceffd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,14 +4,6 @@ For a list of breaking changes, check [here](#breaking-changes).
 
 ## Unreleased
 
-<!--
-
-TODO:
-
-Check --data-binary with string POST data, e.g. JSON with weird chars...
-
--->
-
 Babashka.curl:
 
 - [#35](https://github.com/babashka/babashka.curl/issues/35): use
@@ -28,6 +20,7 @@ Sci:
 
 - Allow combinations of interfaces and protocols in `reify` [#540](https://github.com/borkdude/sci/issues/540)
   ([@GreshamDanielStephens](https://github.com/GreshamDanielStephens))
+- Fix metadata on non-constant map literal expression [#546](https://github.com/borkdude/sci/issues/546)
 
 ## 0.2.12
 
diff --git a/sci b/sci
index 5912a2b6..e27b60c0 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit 5912a2b6d12d3a6c46f903383c61b784cddbc174
+Subproject commit e27b60c04a09dda4de6b3b8780e4a4ba0cddddcc

From 333dc6bbf96958b6f13c8d48fe04a109e6e095ee Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 8 Mar 2021 23:46:52 +0100
Subject: [PATCH 052/145] sci#546

---
 sci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci b/sci
index e27b60c0..e1988c02 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit e27b60c04a09dda4de6b3b8780e4a4ba0cddddcc
+Subproject commit e1988c02e8599220949bbb4fe4839161ecf5f0a0

From d69b8de80f1989931a553f8f2fc6246e39f5bfee Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Tue, 9 Mar 2021 09:33:57 +0100
Subject: [PATCH 053/145] v0.2.13

---
 resources/BABASHKA_VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/BABASHKA_VERSION b/resources/BABASHKA_VERSION
index 947c3a5c..f21e5a1f 100644
--- a/resources/BABASHKA_VERSION
+++ b/resources/BABASHKA_VERSION
@@ -1 +1 @@
-0.2.13-SNAPSHOT
\ No newline at end of file
+0.2.13
\ No newline at end of file

From 90d089e78bbe9c373c3d72bf08def3a6d0ff0567 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Tue, 9 Mar 2021 09:45:55 +0100
Subject: [PATCH 054/145] Version bump

---
 CHANGELOG.md                        | 2 +-
 resources/BABASHKA_RELEASED_VERSION | 2 +-
 resources/BABASHKA_VERSION          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c6ceffd..e45cc207 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 For a list of breaking changes, check [here](#breaking-changes).
 
-## Unreleased
+## v0.2.13
 
 Babashka.curl:
 
diff --git a/resources/BABASHKA_RELEASED_VERSION b/resources/BABASHKA_RELEASED_VERSION
index 25cd22b6..f21e5a1f 100644
--- a/resources/BABASHKA_RELEASED_VERSION
+++ b/resources/BABASHKA_RELEASED_VERSION
@@ -1 +1 @@
-0.2.12
\ No newline at end of file
+0.2.13
\ No newline at end of file
diff --git a/resources/BABASHKA_VERSION b/resources/BABASHKA_VERSION
index f21e5a1f..ebe52df8 100644
--- a/resources/BABASHKA_VERSION
+++ b/resources/BABASHKA_VERSION
@@ -1 +1 @@
-0.2.13
\ No newline at end of file
+0.2.14-SNAPSHOT
\ No newline at end of file

From 20285cb677aea3881960d3d7ce4e53ebe9ed27da Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Tue, 9 Mar 2021 09:47:15 +0100
Subject: [PATCH 055/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e45cc207..ebf5a1f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,8 +6,7 @@ For a list of breaking changes, check [here](#breaking-changes).
 
 Babashka.curl:
 
-- [#35](https://github.com/babashka/babashka.curl/issues/35): use
-  `--data-binary` when sending files or streams
+- Use `--data-binary` when sending files or streams [#35](https://github.com/babashka/babashka.curl/issues/35)
 
 Babashka.fs:
 

From 6246e1e605d2baca8eafc1ac91dad9d264c33076 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Tue, 9 Mar 2021 09:49:39 +0100
Subject: [PATCH 056/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ebf5a1f3..dd96dec9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ For a list of breaking changes, check [here](#breaking-changes).
 
 ## v0.2.13
 
+### Enhancements / fixes
+
+- Add more interfaces to be used with `reify` ([@wilkerlucio](https://github.com/wilkerlucio)) (mostly to support smart maps with [pathom3](https://github.com/wilkerlucio/pathom3))
+
 Babashka.curl:
 
 - Use `--data-binary` when sending files or streams [#35](https://github.com/babashka/babashka.curl/issues/35)

From e1408f2bfbfcc76e62148892f3f8a7a62779c1e8 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Tue, 9 Mar 2021 10:58:27 +0100
Subject: [PATCH 057/145] Update examples [skip ci]

---
 examples/README.md                            | 64 +++++++++++----
 examples/file-server.clj                      | 82 +++++++++++++++++++
 ...erver.clj => http_server_from_scratch.clj} |  5 +-
 .../{image_viewer.clj => image-viewer.clj}    |  0
 examples/notes.clj                            |  5 ++
 examples/rofi.clj                             | 12 ---
 6 files changed, 140 insertions(+), 28 deletions(-)
 create mode 100755 examples/file-server.clj
 rename examples/{http_server.clj => http_server_from_scratch.clj} (92%)
 rename examples/{image_viewer.clj => image-viewer.clj} (100%)
 delete mode 100644 examples/rofi.clj

diff --git a/examples/README.md b/examples/README.md
index 4b55b68a..9eb0c0d1 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -1,5 +1,37 @@
 # Examples
 
+- [Examples](#examples)
+  - [Delete a list of files returned by a Unix command](#delete-a-list-of-files-returned-by-a-unix-command)
+  - [Calculate aggregate size of directory](#calculate-aggregate-size-of-directory)
+  - [Shuffle the lines of a file](#shuffle-the-lines-of-a-file)
+  - [Fetch latest Github release tag](#fetch-latest-github-release-tag)
+  - [Generate deps.edn entry for a gitlib](#generate-depsedn-entry-for-a-gitlib)
+  - [View download statistics from Clojars](#view-download-statistics-from-clojars)
+  - [Portable tree command](#portable-tree-command)
+  - [List outdated maven dependencies](#list-outdated-maven-dependencies)
+  - [Convert project.clj to deps.edn](#convert-projectclj-to-depsedn)
+  - [Print current time in California](#print-current-time-in-california)
+  - [Tiny http server](#tiny-http-server)
+  - [Print random docstring](#print-random-docstring)
+  - [Cryptographic hash](#cryptographic-hash)
+  - [Package script as Docker image](#package-script-as-docker-image)
+  - [Extract single file from zip](#extract-single-file-from-zip)
+  - [Note taking app](#note-taking-app)
+  - [which](#which)
+  - [pom.xml version](#pomxml-version)
+  - [Whatsapp frequencies](#whatsapp-frequencies)
+  - [Find unused vars](#find-unused-vars)
+  - [List contents of jar file](#list-contents-of-jar-file)
+  - [Invoke vim inside a script](#invoke-vim-inside-a-script)
+  - [Portal](#portal)
+  - [Image viewer](#image-viewer)
+  - [File server](#file-server)
+  - [Torrent viewer](#torrent-viewer)
+  - [cprop.clj](#cpropclj)
+  - [fzf](#fzf)
+  - [digitalocean-ping.clj](#digitalocean-pingclj)
+  - [download-aliases.clj](#download-aliasesclj)
+
 Here's a gallery of useful examples. Do you have a useful example? PR welcome!
 
 ## Delete a list of files returned by a Unix command
@@ -161,7 +193,9 @@ See [examples/pst.clj](https://github.com/babashka/babashka/blob/master/examples
 
 ## Tiny http server
 
-See [examples/http_server.clj](https://github.com/babashka/babashka/blob/master/examples/http_server.clj)
+This implements an http server from scratch. Note that babashka comes with `org.httpkit.server` now, so you don't need to build an http server from scratch anymore.
+
+See [examples/http_server_from_scratch.clj](https://github.com/babashka/babashka/blob/master/examples/http_server_from_scratch.clj)
 
 Original by [@souenzzo](https://gist.github.com/souenzzo/a959a4c5b8c0c90df76fe33bb7dfe201)
 
@@ -330,10 +364,22 @@ Opens browser window and lets user navigate through images of all sub-directorie
 Example usage:
 
 ``` shell
-$ examples/image_viewer.clj
+$ examples/image-viewer.clj
 ```
 
-See [image_viewer.clj](image_viewer.clj).
+See [image-viewer.clj](image-viewer.clj).
+
+## File server
+
+Opens browser window and lets user navigate through filesystem.
+
+Example usage:
+
+``` shell
+$ examples/file-server.clj
+```
+
+See [file-server.clj](file-server.clj).
 
 ## Torrent viewer
 
@@ -370,18 +416,6 @@ Example usage:
 $ cat src/babashka/main.clj | bb examples/fzf.clj
 ```
 
-## [rofi](rofi.clj)
-
-Invoke [rofi](https://github.com/davatorium/rofi), a type-to-filter menu on linux, from babashka.
-
-See [rofi.clj](rofi.clj)
-
-Example usage:
-
-``` shell
-$ cat src/babashka/main.clj | bb examples/rofi.clj
-```
-
 ## [digitalocean-ping.clj](digitalocean-ping.clj)
 
 The script allows to define which DigitalOcean cloud datacenter (region) has best network performance (ping latency).
diff --git a/examples/file-server.clj b/examples/file-server.clj
new file mode 100755
index 00000000..65284357
--- /dev/null
+++ b/examples/file-server.clj
@@ -0,0 +1,82 @@
+#!/usr/bin/env bb
+#_" -*- mode: clojure; -*-"
+;; Source: https://gist.github.com/holyjak/36c6284c047ffb7573e8a34399de27d8
+
+;; Based on https://github.com/babashka/babashka/blob/master/examples/image_viewer.clj
+(ns file-server
+  (:require [babashka.fs :as fs]
+            [clojure.java.browse :as browse]
+            [clojure.string :as str]
+            [clojure.tools.cli :refer [parse-opts]]
+            [hiccup2.core :as html]
+            [org.httpkit.server :as server])
+  (:import [java.net URLDecoder URLEncoder]))
+
+(def cli-options [["-p" "--port PORT" "Port for HTTP server" :default 8090 :parse-fn #(Integer/parseInt %)]
+                  ["-d" "--dir DIR" "Directory to serve files from" :default "."]
+                  ["-h" "--help" "Print usage info"]])
+
+(def parsed-args (parse-opts *command-line-args* cli-options))
+(def opts (:options parsed-args))
+
+(cond
+  (:help opts)
+  (do (println "Start a http server for static files in the given dir. Usage:\n" (:summary parsed-args))
+      (System/exit 0))
+
+  (:errors parsed-args)
+  (do (println "Invalid arguments:\n" (str/join "\n" (:errors parsed-args)))
+      (System/exit 1))
+
+  :else
+  :continue)
+
+
+(def port (:port opts))
+(def dir (fs/path (:dir opts)))
+
+(assert (fs/directory? dir) (str "The given dir `" dir "` is not a directory."))
+
+(defn index [f]
+  (let [files (map #(str (.relativize dir %))
+                   (fs/list-dir f))]
+    {:body (-> [:html
+                [:head
+                 [:meta {:charset "UTF-8"}]
+                 [:title (str "Index of `" f "`")]]
+                [:body
+                 [:h1 "Index of " [:code (str f)]]
+                 [:ul
+                  (for [child files]
+                    [:li [:a {:href (URLEncoder/encode (str child))} child
+                          (when (fs/directory? (fs/path dir child)) "/")]])]
+                 [:hr]
+                 [:footer {:style {"text-aling" "center"}} "Served by http-server.clj"]]]
+               html/html
+               str)}))
+
+(defn body [path]
+  {:body (fs/file path)})
+
+(server/run-server
+ (fn [{:keys [:uri]}]
+   (let [f (fs/path dir (str/replace-first (URLDecoder/decode uri) #"^/" ""))
+         index-file (fs/path f "index.html")]
+     (cond
+       (and (fs/directory? f) (fs/readable? index-file))
+       (body index-file)
+
+       (fs/directory? f)
+       (index f)
+
+       (fs/readable? f)
+       (body f)
+
+       :else
+       {:status 404 :body (str "Not found `" f "` in " dir)})))
+ {:port port})
+
+(println "Starting http server at " port "for" (str dir))
+(browse/browse-url (format "http://localhost:%s/" port))
+
+@(promise)
diff --git a/examples/http_server.clj b/examples/http_server_from_scratch.clj
similarity index 92%
rename from examples/http_server.clj
rename to examples/http_server_from_scratch.clj
index 213f6d5e..0109f59d 100755
--- a/examples/http_server.clj
+++ b/examples/http_server_from_scratch.clj
@@ -1,10 +1,13 @@
 #!/usr/bin/env bb
 
-;; This example creates a file serving web server
+;; This example creates a file serving web server from scratch.
 ;; It accepts a single connection from a browser and serves content to the connected browser
 ;; after the connection times out, this script will serve no more.
 ;; Also see notes.clj for another web app example.
 
+;; Note that babashka comes with org.httpkit.server now, so you don't need to
+;; build an http server from scratch anymore. We leave this script here for educational purposes.
+
 (import (java.net ServerSocket))
 (require '[clojure.java.io :as io]
          '[clojure.string :as string])
diff --git a/examples/image_viewer.clj b/examples/image-viewer.clj
similarity index 100%
rename from examples/image_viewer.clj
rename to examples/image-viewer.clj
diff --git a/examples/notes.clj b/examples/notes.clj
index c23769ef..02e15588 100755
--- a/examples/notes.clj
+++ b/examples/notes.clj
@@ -1,5 +1,10 @@
 #!/usr/bin/env bb
 
+;; Note that babashka comes with org.httpkit.server now, so you don't need to
+;; build an http server from scratch anymore like we do here. We should update
+;; this script to the built-in webserver. Whoever reads this is welcome to
+;; submit a PR.
+
 (import (java.net ServerSocket))
 (require '[clojure.java.io :as io]
          '[clojure.string :as str])
diff --git a/examples/rofi.clj b/examples/rofi.clj
deleted file mode 100644
index da7045e6..00000000
--- a/examples/rofi.clj
+++ /dev/null
@@ -1,12 +0,0 @@
-(require '[babashka.process :as p])
-
-(defn rofi [s]
-  (let [proc (p/process
-               ["rofi" "-i" "-dmenu" "-mesg" "Select" "-sync" "-p" "*"]
-               {:in  s :err :inherit
-                :out :string})]
-    (:out @proc)))
-
-(rofi (slurp *in*))
-
-;; `echo "hi\nthere\nclj" | bb examples/rofi.clj`

From bb3e453f62f6a2aaca0e52807198f8d284d2f616 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Wed, 10 Mar 2021 22:41:12 +0100
Subject: [PATCH 058/145] sci: add delay?

---
 sci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci b/sci
index e1988c02..c8e4c2f4 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit e1988c02e8599220949bbb4fe4839161ecf5f0a0
+Subproject commit c8e4c2f46c8dbf2b1b1b2b1fcdd406e884380450

From 16e92fa5811f90bca5afae042b7caeb223dd8906 Mon Sep 17 00:00:00 2001
From: Toni Dahl <988779+K1ll3rF0x@users.noreply.github.com>
Date: Wed, 10 Mar 2021 23:42:09 +0200
Subject: [PATCH 059/145] Guess and add correct "Content-Type" headers for
 responses. (#750) [skip ci]

* A correct MIME type of a served file is guessed by file extension.
* For example, SVG images are now displayed correctly in a web browser.
---
 examples/file-server.clj | 116 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 115 insertions(+), 1 deletion(-)

diff --git a/examples/file-server.clj b/examples/file-server.clj
index 65284357..d8fa3f72 100755
--- a/examples/file-server.clj
+++ b/examples/file-server.clj
@@ -37,6 +37,119 @@
 
 (assert (fs/directory? dir) (str "The given dir `" dir "` is not a directory."))
 
+;; A simple mime type utility from https://github.com/ring-clojure/ring/blob/master/ring-core/src/ring/util/mime_type.clj
+(def ^{:doc "A map of file extensions to mime-types."}
+  default-mime-types
+  {"7z"       "application/x-7z-compressed"
+   "aac"      "audio/aac"
+   "ai"       "application/postscript"
+   "appcache" "text/cache-manifest"
+   "asc"      "text/plain"
+   "atom"     "application/atom+xml"
+   "avi"      "video/x-msvideo"
+   "bin"      "application/octet-stream"
+   "bmp"      "image/bmp"
+   "bz2"      "application/x-bzip"
+   "class"    "application/octet-stream"
+   "cer"      "application/pkix-cert"
+   "crl"      "application/pkix-crl"
+   "crt"      "application/x-x509-ca-cert"
+   "css"      "text/css"
+   "csv"      "text/csv"
+   "deb"      "application/x-deb"
+   "dart"     "application/dart"
+   "dll"      "application/octet-stream"
+   "dmg"      "application/octet-stream"
+   "dms"      "application/octet-stream"
+   "doc"      "application/msword"
+   "dvi"      "application/x-dvi"
+   "edn"      "application/edn"
+   "eot"      "application/vnd.ms-fontobject"
+   "eps"      "application/postscript"
+   "etx"      "text/x-setext"
+   "exe"      "application/octet-stream"
+   "flv"      "video/x-flv"
+   "flac"     "audio/flac"
+   "gif"      "image/gif"
+   "gz"       "application/gzip"
+   "htm"      "text/html"
+   "html"     "text/html"
+   "ico"      "image/x-icon"
+   "iso"      "application/x-iso9660-image"
+   "jar"      "application/java-archive"
+   "jpe"      "image/jpeg"
+   "jpeg"     "image/jpeg"
+   "jpg"      "image/jpeg"
+   "js"       "text/javascript"
+   "json"     "application/json"
+   "lha"      "application/octet-stream"
+   "lzh"      "application/octet-stream"
+   "mov"      "video/quicktime"
+   "m3u8"     "application/x-mpegurl"
+   "m4v"      "video/mp4"
+   "mjs"      "text/javascript"
+   "mp3"      "audio/mpeg"
+   "mp4"      "video/mp4"
+   "mpd"      "application/dash+xml"
+   "mpe"      "video/mpeg"
+   "mpeg"     "video/mpeg"
+   "mpg"      "video/mpeg"
+   "oga"      "audio/ogg"
+   "ogg"      "audio/ogg"
+   "ogv"      "video/ogg"
+   "pbm"      "image/x-portable-bitmap"
+   "pdf"      "application/pdf"
+   "pgm"      "image/x-portable-graymap"
+   "png"      "image/png"
+   "pnm"      "image/x-portable-anymap"
+   "ppm"      "image/x-portable-pixmap"
+   "ppt"      "application/vnd.ms-powerpoint"
+   "ps"       "application/postscript"
+   "qt"       "video/quicktime"
+   "rar"      "application/x-rar-compressed"
+   "ras"      "image/x-cmu-raster"
+   "rb"       "text/plain"
+   "rd"       "text/plain"
+   "rss"      "application/rss+xml"
+   "rtf"      "application/rtf"
+   "sgm"      "text/sgml"
+   "sgml"     "text/sgml"
+   "svg"      "image/svg+xml"
+   "swf"      "application/x-shockwave-flash"
+   "tar"      "application/x-tar"
+   "tif"      "image/tiff"
+   "tiff"     "image/tiff"
+   "ts"       "video/mp2t"
+   "ttf"      "font/ttf"
+   "txt"      "text/plain"
+   "webm"     "video/webm"
+   "wmv"      "video/x-ms-wmv"
+   "woff"     "font/woff"
+   "woff2"    "font/woff2"
+   "xbm"      "image/x-xbitmap"
+   "xls"      "application/vnd.ms-excel"
+   "xml"      "text/xml"
+   "xpm"      "image/x-xpixmap"
+   "xwd"      "image/x-xwindowdump"
+   "zip"      "application/zip"})
+
+;; https://github.com/ring-clojure/ring/blob/master/ring-core/src/ring/util/mime_type.clj
+(defn- filename-ext
+  "Returns the file extension of a filename or filepath."
+  [filename]
+  (if-let [ext (second (re-find #"\.([^./\\]+)$" filename))]
+    (str/lower-case ext)))
+
+;; https://github.com/ring-clojure/ring/blob/master/ring-core/src/ring/util/mime_type.clj
+(defn ext-mime-type
+  "Get the mimetype from the filename extension. Takes an optional map of
+  extensions to mimetypes that overrides values in the default-mime-types map."
+  ([filename]
+   (ext-mime-type filename {}))
+  ([filename mime-types]
+   (let [mime-types (merge default-mime-types mime-types)]
+     (mime-types (filename-ext filename)))))
+
 (defn index [f]
   (let [files (map #(str (.relativize dir %))
                    (fs/list-dir f))]
@@ -56,7 +169,8 @@
                str)}))
 
 (defn body [path]
-  {:body (fs/file path)})
+  {:headers {"Content-Type" (ext-mime-type (fs/file-name path))}
+   :body (fs/file path)})
 
 (server/run-server
  (fn [{:keys [:uri]}]

From 39284ae707451d59bf7eedc46bbd42a948511d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wilker=20L=C3=BAcio?= <wilkerlucio@users.noreply.github.com>
Date: Wed, 10 Mar 2021 19:21:35 -0300
Subject: [PATCH 060/145] Add IndexOutOfBoundsException and Map$Entry (#751)

* Add IndexOutOfBoundsException, IHashEq and Map$Entry

* Remove IHashEq interface
---
 src/babashka/impl/classes.clj | 4 +++-
 src/babashka/impl/reify.clj   | 4 ++++
 src/babashka/main.clj         | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/babashka/impl/classes.clj b/src/babashka/impl/classes.clj
index 7b84c2a6..52c897f9 100644
--- a/src/babashka/impl/classes.clj
+++ b/src/babashka/impl/classes.clj
@@ -118,6 +118,7 @@
           java.lang.Exception
           java.lang.Float
           java.lang.IllegalArgumentException
+          java.lang.IndexOutOfBoundsException
           java.lang.Integer
           java.lang.Iterable
           java.lang.Long
@@ -297,7 +298,8 @@
                       clojure.lang.Seqable
                       clojure.lang.Volatile
                       java.util.List
-                      java.util.Iterator]
+                      java.util.Iterator
+                      java.util.Map$Entry]
     :custom ~custom-map})
 
 (defmacro gen-class-map []
diff --git a/src/babashka/impl/reify.clj b/src/babashka/impl/reify.clj
index fa008737..6dca3a52 100644
--- a/src/babashka/impl/reify.clj
+++ b/src/babashka/impl/reify.clj
@@ -62,6 +62,10 @@
      clojure.lang.ILookup
      {valAt [[this k] [this k default]]}
 
+     java.util.Map$Entry
+     {getKey [[this]]
+      getValue [[this]]}
+
      clojure.lang.IFn
      {applyTo [[this arglist]]
       invoke  [[this]
diff --git a/src/babashka/main.clj b/src/babashka/main.clj
index ad1aa25a..06c7792d 100644
--- a/src/babashka/main.clj
+++ b/src/babashka/main.clj
@@ -436,6 +436,7 @@ Use -- to separate script command line args from bb command line args.
     Comparable java.lang.Comparable
     Double java.lang.Double
     Exception java.lang.Exception
+    IndexOutOfBoundsException java.lang.IndexOutOfBoundsException
     IllegalArgumentException java.lang.IllegalArgumentException
     Integer java.lang.Integer
     Iterable java.lang.Iterable

From 38d18acd4d93ce97f4f75e3570bf877c823367fe Mon Sep 17 00:00:00 2001
From: Grazfather <grazfather@gmail.com>
Date: Fri, 12 Mar 2021 04:16:39 -0500
Subject: [PATCH 061/145] Update install to support future tar.gz releases
 (#752)

* Update install to support future tar.gz releases

* CI: Release as .tar.gz instead of .zip
---
 .circleci/script/docker               |  4 ++--
 .circleci/script/publish_artifact.clj |  2 +-
 .circleci/script/release              |  4 ++--
 install                               | 25 ++++++++++++++++++-------
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/.circleci/script/docker b/.circleci/script/docker
index 6291560e..1d75214c 100755
--- a/.circleci/script/docker
+++ b/.circleci/script/docker
@@ -17,12 +17,12 @@ fi
 if [ -z "$CIRCLE_PULL_REQUEST" ] && [ "$CIRCLE_BRANCH" = "master" ]; then
     echo "Building Docker image $image_name:$image_tag"
     echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USER" --password-stdin
-    unzip "/tmp/release/babashka-${image_tag}-linux-amd64.zip"
+    tar zxvf  "/tmp/release/babashka-${image_tag}-linux-amd64.tar.gz"
     docker build -t "$image_name" -f Dockerfile.ci .
     docker tag "$image_name:$latest_tag" "$image_name:$image_tag"
     rm -f bb
     if [[ $snapshot == "false" ]]; then
-        unzip "/tmp/release/babashka-${image_tag}-linux-static-amd64.zip"
+        tar zxvf  "/tmp/release/babashka-${image_tag}-linux-static-amd64.tar.gz"
         docker build -t "$image_name:alpine" -f Dockerfile.alpine .
         docker tag "$image_name:alpine" "$image_name:$image_tag-alpine"
     fi
diff --git a/.circleci/script/publish_artifact.clj b/.circleci/script/publish_artifact.clj
index 3ac5ff32..c7a9acca 100755
--- a/.circleci/script/publish_artifact.clj
+++ b/.circleci/script/publish_artifact.clj
@@ -16,7 +16,7 @@
       (curl/post slack-hook-url {:headers {"content-type" "application/json"}
                                  :body json}))))
 
-(def release-text (format "[%s - %s@%s]: https://%s-201467090-gh.circle-artifacts.com/0/release/babashka-%s-%s-amd64.zip"
+(def release-text (format "[%s - %s@%s]: https://%s-201467090-gh.circle-artifacts.com/0/release/babashka-%s-%s-amd64.tar.gz"
                           (System/getenv "BABASHKA_PLATFORM")
                           (System/getenv "CIRCLE_BRANCH")
                           (System/getenv "CIRCLE_SHA1")
diff --git a/.circleci/script/release b/.circleci/script/release
index 5e6325bf..a9edaeff 100755
--- a/.circleci/script/release
+++ b/.circleci/script/release
@@ -11,9 +11,9 @@ cd /tmp/release
 mkdir -p /tmp/bb_size
 ./bb '(spit "/tmp/bb_size/size" (.length (io/file "bb")))'
 
-## release binary as zip archive
+## release binary as tar.gz archive
 
-zip "babashka-$VERSION-$BABASHKA_PLATFORM-amd64.zip" bb # bbk
+tar zcvf "babashka-$VERSION-$BABASHKA_PLATFORM-amd64.tar.gz" bb # bbk
 
 ## cleanup
 
diff --git a/install b/install
index 155f4182..a5d7bd0e 100755
--- a/install
+++ b/install
@@ -64,25 +64,36 @@ case "$(uname -s)" in
     Darwin*)    platform=macos;;
 esac
 
+# Ugly ugly conversion of version to a comparable number
+IFS='.' read -ra VER <<< "$version"
+vernum=$(printf "%03d%03d%03d" "${VER[0]}" "${VER[1]}" "${VER[2]}")
+
+if [[ $vernum -le 000002013 ]]; then
+  ext="zip"
+  util="$(which unzip) -qqo"
+else
+  ext="tar.gz"
+  util="$(which tar) -zxf"
+fi
+
 download_url="https://github.com/babashka/babashka/releases/download/v$version/babashka-$version-$platform-amd64.zip"
 
 mkdir -p "$download_dir"
 cd "$download_dir"
 echo -e "Downloading $download_url to $download_dir"
-rm -rf "babashka-$version-$platform-amd64.zip"
+rm -rf "babashka-$version-$platform-amd64."$ext
 rm -rf "bb"
-curl -o "babashka-$version-$platform-amd64.zip" -sL "https://github.com/babashka/babashka/releases/download/v$version/babashka-$version-$platform-amd64.zip"
-unzip -qqo "babashka-$version-$platform-amd64.zip"
-rm "babashka-$version-$platform-amd64.zip"
+curl -o "babashka-$version-$platform-amd64."$ext -sL "https://github.com/babashka/babashka/releases/download/v$version/babashka-$version-$platform-amd64."$ext
+$util "babashka-$version-$platform-amd64."$ext
+rm "babashka-$version-$platform-amd64."$ext
 
 if [ "$download_dir" != "$install_dir" ]
 then
     mkdir -p "$install_dir"
-    cd "$install_dir"
-    if [ -f bb ]; then
+    if [ -f "$install_dir/bb" ]; then
         echo "Moving $install_dir/bb to $install_dir/bb.old"
     fi
-    mv -f "$download_dir/bb" "$PWD/bb"
+    mv -f "$download_dir/bb" "$install_dir/bb"
 fi
 
 echo "Successfully installed bb in $install_dir"

From 45faf1ec6302ed9717acdea771741fa6109fe085 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Fri, 12 Mar 2021 10:24:29 +0100
Subject: [PATCH 062/145] Add java.io.OutputStreamWriter and
 java.io.PrintStream

---
 src/babashka/impl/classes.clj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/babashka/impl/classes.clj b/src/babashka/impl/classes.clj
index 52c897f9..e71cb599 100644
--- a/src/babashka/impl/classes.clj
+++ b/src/babashka/impl/classes.clj
@@ -100,6 +100,8 @@
           java.io.OutputStream
           java.io.FileReader
           java.io.InputStreamReader
+          java.io.OutputStreamWriter
+          java.io.PrintStream
           java.io.PushbackInputStream
           java.io.Reader
           java.io.SequenceInputStream

From 38c7bc1c172b399fd20ef2014ad99b1afbb7c78f Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Fri, 12 Mar 2021 10:52:11 +0100
Subject: [PATCH 063/145] [#667] Add test

---
 test/babashka/main_test.clj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/babashka/main_test.clj b/test/babashka/main_test.clj
index 165601be..c590d89a 100644
--- a/test/babashka/main_test.clj
+++ b/test/babashka/main_test.clj
@@ -565,7 +565,8 @@
 
 (deftest var-print-method-test
   (when test-utils/native?
-    (is (bb nil "(defmethod print-method sci.lang.IVar [o w] (.write w (str :foo (symbol o)))) (def x 1) (= \":foouser/x\" (pr-str #'x))"))))
+    (is (bb nil "(defmethod print-method sci.lang.IVar [o w] (.write w (str :foo (symbol o)))) (def x 1) (= \":foouser/x\" (pr-str #'x))"))
+    (is (= :foouser/x (bb nil "(defmethod print-method sci.lang.IVar [o w] (.write w (str :foo (symbol o)))) (def x 1)")))))
 
 ;;;; Scratch
 

From 686a72e1b4b16dd1dcf70a51bcd1a1023572009a Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Fri, 12 Mar 2021 10:54:42 +0100
Subject: [PATCH 064/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd96dec9..cac7ad87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 For a list of breaking changes, check [here](#breaking-changes).
 
+## Unreleased
+
+### Enhancements / fixes
+
+- Fix `print-method` when writing to stdout [#667](https://github.com/babashka/babashka/issues/667)
+
 ## v0.2.13
 
 ### Enhancements / fixes

From 04cd32b84bc5209fb6f08189e34ecd1f3a8d153f Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Fri, 12 Mar 2021 10:57:43 +0100
Subject: [PATCH 065/145] [#754] Fix interop with System/out

---
 test/babashka/main_test.clj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/babashka/main_test.clj b/test/babashka/main_test.clj
index c590d89a..d48dea65 100644
--- a/test/babashka/main_test.clj
+++ b/test/babashka/main_test.clj
@@ -568,6 +568,10 @@
     (is (bb nil "(defmethod print-method sci.lang.IVar [o w] (.write w (str :foo (symbol o)))) (def x 1) (= \":foouser/x\" (pr-str #'x))"))
     (is (= :foouser/x (bb nil "(defmethod print-method sci.lang.IVar [o w] (.write w (str :foo (symbol o)))) (def x 1)")))))
 
+(deftest stdout-interop-test
+  (when test-utils/native?
+    (is (= 'Something (bb nil "(.print (System/out) \"Something\")")))))
+
 ;;;; Scratch
 
 (comment

From 02da9336c4b5ad5f5aeb749f8d4dca7779aea72b Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Fri, 12 Mar 2021 11:00:11 +0100
Subject: [PATCH 066/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cac7ad87..25234304 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,15 @@ For a list of breaking changes, check [here](#breaking-changes).
 
 ## Unreleased
 
+### TODO
+
+- Roll back `reify` changes in v0.2.13. See [sci#549](https://github.com/borkdude/sci/issues/549).
+- Add support for arm64 binaries
+
 ### Enhancements / fixes
 
 - Fix `print-method` when writing to stdout [#667](https://github.com/babashka/babashka/issues/667)
+- Fix interop with `System/out` [#754](https://github.com/babashka/babashka/issues/754)
 
 ## v0.2.13
 

From 6a47a4dc2931b36dea20c5361b6a9e1e49a60573 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Fri, 12 Mar 2021 14:47:03 +0100
Subject: [PATCH 067/145] Preliminary proxy support

---
 sci                           | 2 +-
 src/babashka/impl/classes.clj | 3 ++-
 src/babashka/main.clj         | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sci b/sci
index c8e4c2f4..9dab6065 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit c8e4c2f46c8dbf2b1b1b2b1fcdd406e884380450
+Subproject commit 9dab60653651e94bc535f8a753def10b708ff7e8
diff --git a/src/babashka/impl/classes.clj b/src/babashka/impl/classes.clj
index e71cb599..1185bbb9 100644
--- a/src/babashka/impl/classes.clj
+++ b/src/babashka/impl/classes.clj
@@ -252,7 +252,8 @@
     :methods [borkdude.graal.LockFix] ;; support for locking
 
     :fields [clojure.lang.PersistentQueue]
-    :instance-checks [clojure.lang.Associative
+    :instance-checks [clojure.lang.APersistentMap ;; for proxy
+                      clojure.lang.Associative
                       clojure.lang.Atom
                       clojure.lang.Cons
                       clojure.lang.Counted
diff --git a/src/babashka/main.clj b/src/babashka/main.clj
index 06c7792d..6aa8dc1f 100644
--- a/src/babashka/main.clj
+++ b/src/babashka/main.clj
@@ -26,6 +26,7 @@
    [babashka.impl.pprint :refer [pprint-namespace]]
    [babashka.impl.process :refer [process-namespace]]
    [babashka.impl.protocols :refer [protocols-namespace]]
+   [babashka.impl.proxy :refer [proxy-fn]]
    [babashka.impl.reify :refer [reify-fn]]
    [babashka.impl.repl :as repl]
    [babashka.impl.socket-repl :as socket-repl]
@@ -570,7 +571,8 @@ Use -- to separate script command line args from bb command line args.
                   :load-fn load-fn
                   :uberscript uberscript
                   :readers core/data-readers
-                  :reify-fn reify-fn}
+                  :reify-fn reify-fn
+                  :proxy-fn proxy-fn}
             opts (addons/future opts)
             sci-ctx (sci/init opts)
             _ (vreset! common/ctx sci-ctx)

From fa92537bdf220c130e1c9d3ed050a706a072b665 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Fri, 12 Mar 2021 14:47:18 +0100
Subject: [PATCH 068/145] Preliminary proxy support

---
 src/babashka/impl/proxy.clj | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 src/babashka/impl/proxy.clj

diff --git a/src/babashka/impl/proxy.clj b/src/babashka/impl/proxy.clj
new file mode 100644
index 00000000..59bfec91
--- /dev/null
+++ b/src/babashka/impl/proxy.clj
@@ -0,0 +1,18 @@
+(ns babashka.impl.proxy
+  {:no-doc true}
+  (:require [sci.impl.types]))
+
+(set! *warn-on-reflection* false)
+
+(defn method-or-bust [methods k]
+  (or (get methods k)
+      (throw (UnsupportedOperationException. "Method not implemented: " k))))
+
+(defn proxy-fn [{:keys [:class :methods]}]
+  (case (.getName ^Class class)
+    "clojure.lang.APersistentMap"
+    (proxy [clojure.lang.APersistentMap] []
+      (seq [] ((method-or-bust methods 'seq)))
+      (valAt
+        ([k] ((method-or-bust methods 'valAt) k))
+        ([k default] ((method-or-bust methods 'valAt) k default))))))

From 5555ea4ede9b7be3f2ab2ef7105264ec62bef680 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Fri, 12 Mar 2021 20:31:58 +0100
Subject: [PATCH 069/145] APersistentMap test

---
 src/babashka/impl/classes.clj |  1 +
 src/babashka/impl/proxy.clj   | 19 +++++++++--
 test/babashka/proxy_test.clj  | 63 +++++++++++++++++++++++++++++++++++
 3 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 test/babashka/proxy_test.clj

diff --git a/src/babashka/impl/classes.clj b/src/babashka/impl/classes.clj
index 1185bbb9..aea63a1e 100644
--- a/src/babashka/impl/classes.clj
+++ b/src/babashka/impl/classes.clj
@@ -253,6 +253,7 @@
 
     :fields [clojure.lang.PersistentQueue]
     :instance-checks [clojure.lang.APersistentMap ;; for proxy
+                      clojure.lang.AMapEntry ;; for proxy
                       clojure.lang.Associative
                       clojure.lang.Atom
                       clojure.lang.Cons
diff --git a/src/babashka/impl/proxy.clj b/src/babashka/impl/proxy.clj
index 59bfec91..a859c53d 100644
--- a/src/babashka/impl/proxy.clj
+++ b/src/babashka/impl/proxy.clj
@@ -12,7 +12,22 @@
   (case (.getName ^Class class)
     "clojure.lang.APersistentMap"
     (proxy [clojure.lang.APersistentMap] []
-      (seq [] ((method-or-bust methods 'seq)))
+      (iterator [] (if-let [m (get methods 'iterator)]
+                     (m)
+                     (proxy-super iterator))) ;; TODO: should we call proxy-super as a fallback always?
+      (containsKey [k] (if-let [m (get methods 'containsKey)]
+                         (m k)
+                         (proxy-super containsKey k)))
+      (entryAt [k] ((method-or-bust methods 'entryAt) k))
       (valAt
         ([k] ((method-or-bust methods 'valAt) k))
-        ([k default] ((method-or-bust methods 'valAt) k default))))))
+        ([k default] ((method-or-bust methods 'valAt) k default)))
+      (cons [v] ((method-or-bust methods 'cons) v))
+      (count [] ((method-or-bust methods 'count)))
+      (assoc [k v] ((method-or-bust methods 'assoc) k v))
+      (without [k] ((method-or-bust methods 'without) k))
+      (seq [] ((method-or-bust methods 'seq))))
+    "clojure.lang.AMapEntry"
+    (proxy [clojure.lang.AMapEntry] []
+      (key [] ((method-or-bust methods 'key)))
+      (val [] ((method-or-bust methods 'val))))))
diff --git a/test/babashka/proxy_test.clj b/test/babashka/proxy_test.clj
new file mode 100644
index 00000000..c59e0e71
--- /dev/null
+++ b/test/babashka/proxy_test.clj
@@ -0,0 +1,63 @@
+(ns babashka.proxy-test
+  (:require
+   [babashka.test-utils :as test-utils]
+   [clojure.edn :as edn]
+   [clojure.test :as test :refer [deftest is]]))
+
+(defn bb [& args]
+  (edn/read-string
+   {:readers *data-readers*
+    :eof nil}
+   (apply test-utils/bb nil (map str args))))
+
+(def code
+  '(do
+     (defn auto-deref
+       "If value implements IDeref, deref it, otherwise return original."
+       [x]
+       (if (instance? clojure.lang.IDeref x)
+         @x
+         x))
+     (defn proxy-deref-map
+       {:added "1.0"}
+       [m]
+       (proxy [clojure.lang.APersistentMap]
+           []
+         (iterator []
+           ::TODO)
+         (containsKey [k] (contains? m k))
+         (entryAt [k] (when (contains? m k) (proxy [clojure.lang.AMapEntry] []
+                                              (key [] k)
+                                              (val [] (auto-deref(get m k))))))
+         (valAt ([k] (auto-deref (get m k)))
+           ([k default] (auto-deref (get m k default))))
+         (cons [v] (proxy-deref-map (conj m v)))
+         (count [] (count m))
+         (assoc [k v] (proxy-deref-map (assoc m k v)))
+         (without [k] (proxy-deref-map (dissoc m k)))
+         (seq [] (map (fn [[k v]](proxy [clojure.lang.AMapEntry] []
+                                   (key [] k)
+                                   (val [] (auto-deref (get m k))))) m))))
+     (let [m (proxy-deref-map
+              {:a (delay 1)
+               :b (delay 2)
+               :c 3})]
+       [(:a m)
+        (:b m)
+        (:c m)
+        (contains? m :c)
+        (find m :c)
+        (-> (conj m [:d (delay 5)])
+            :d)
+        (count m)
+        (-> (assoc m :d (delay 5))
+            :d)
+        (-> (dissoc m :a)
+            (contains? :a))
+        (seq m)])))
+
+(deftest APersistentMap-proxy-test
+  (is (= [1 2 3 true [:c 3]
+          5 3 5 false
+          '([:a 1] [:b 2] [:c 3])]
+         (bb code))))

From f58748ebbe677ef574a92b04c46b309fd16acbf7 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 13 Mar 2021 11:18:53 +0100
Subject: [PATCH 070/145] Remove proxy-super

---
 src/babashka/impl/proxy.clj | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/babashka/impl/proxy.clj b/src/babashka/impl/proxy.clj
index a859c53d..ad8d8873 100644
--- a/src/babashka/impl/proxy.clj
+++ b/src/babashka/impl/proxy.clj
@@ -12,12 +12,8 @@
   (case (.getName ^Class class)
     "clojure.lang.APersistentMap"
     (proxy [clojure.lang.APersistentMap] []
-      (iterator [] (if-let [m (get methods 'iterator)]
-                     (m)
-                     (proxy-super iterator))) ;; TODO: should we call proxy-super as a fallback always?
-      (containsKey [k] (if-let [m (get methods 'containsKey)]
-                         (m k)
-                         (proxy-super containsKey k)))
+      (iterator [] ((method-or-bust methods 'iterator)))
+      (containsKey [k] ((method-or-bust methods 'containsKey) k))
       (entryAt [k] ((method-or-bust methods 'entryAt) k))
       (valAt
         ([k] ((method-or-bust methods 'valAt) k))

From 85518177245c40f1df97762278ae6f3dd28c2f76 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 13 Mar 2021 12:44:12 +0100
Subject: [PATCH 071/145] Narrow scope of reify

---
 src/babashka/impl/reify.clj  | 227 +++++++++++++++++++----------------
 test/babashka/reify_test.clj |  22 ++--
 2 files changed, 133 insertions(+), 116 deletions(-)

diff --git a/src/babashka/impl/reify.clj b/src/babashka/impl/reify.clj
index 6dca3a52..43f20e45 100644
--- a/src/babashka/impl/reify.clj
+++ b/src/babashka/impl/reify.clj
@@ -4,129 +4,152 @@
 
 (set! *warn-on-reflection* false)
 
+;; Notes
+
+;; We abandoned the 'one reify object that implements all interfaces' approach
+;; due to false positives. E.g. when you would print a reified object, you would
+;; get: 'Not implemented: seq', because print-method thought this object was
+;; seqable, while in fact, it wasn't.
+
+(defn method-or-bust [methods k]
+  (or (get methods k)
+      (throw (UnsupportedOperationException. "Method not implemented: " k))))
+
 (defmacro gen-reify-combos
   "Generates pre-compiled reify combinations"
   [methods]
-  (let [prelude ['reify
-                 'sci.impl.types.IReified
-                 '(getInterfaces [this]
-                                 interfaces)
-                 '(getMethods [this]
-                              methods)
-                 '(getProtocols [this]
-                                protocols)
-                 'java.lang.Object
-                 '(toString [this]
-                            (if-let [m (get methods 'toString)]
-                              (m this)
-                              (str (.. this getClass getName)
-                                   "@" (Integer/toHexString (.hashCode this)))))]]
+  (let [prelude '(reify
+                   sci.impl.types.IReified
+                   (getInterfaces [this]
+                     interfaces)
+                   (getMethods [this]
+                     methods)
+                   (getProtocols [this]
+                     protocols))]
     (list 'fn [{:keys '[interfaces methods protocols]}]
-          (concat prelude
-                  (mapcat (fn [[clazz methods]]
-                            (cons
-                             clazz
-                             (mapcat
-                              (fn [[meth arities]]
-                                (map
-                                 (fn [arity]
-                                   (list meth arity
-                                         (list*
-                                          (list 'or (list 'get 'methods (list 'quote meth))
-                                                `(throw (new Exception (str "Not implemented: "
-                                                                            ~(str meth)))))
-                                          arity)))
-                                 arities))
-                                   methods)))
-                          methods)))))
+          `(cond ~'(empty? interfaces) ~prelude
+                 ~'(> (count interfaces)
+                      1)
+                 (throw (new Exception "Babashka currently does not support reifying more than one interface."))
+                 :else
+                 (case (.getName ~(with-meta '(first interfaces)
+                                    {:tag 'Class}))
+                   ~@(mapcat
+                      (fn [[clazz methods]]
+                        (list
+                         (str clazz)
+                         (concat prelude
+                                 (cons clazz
+                                       (mapcat
+                                        (fn [[meth arities]]
+                                          (map
+                                           (fn [arity]
+                                             (list meth arity
+                                                   (list*
+                                                    (list 'or (list 'get 'methods (list 'quote meth))
+                                                          `(throw (new Exception (str "Not implemented: "
+                                                                                      ~(str meth)))))
+                                                    arity)))
+                                           arities))
+                                        methods)))))
+                      methods)))))
 
-#_:clj-kondo/ignore
+  ;; (require 'clojure.pprint)
+  ;; (clojure.pprint/pprint
+  ;;  (macroexpand '(gen-reify-combos {java.nio.file.FileVisitor
+  ;;                                   {preVisitDirectory  [[this p attrs]]
+  ;;                                    postVisitDirectory [[this p attrs]]
+  ;;                                    visitFile          [[this p attrs]]}})))
+
+  #_:clj-kondo/ignore)
 (def reify-fn
   (gen-reify-combos
-    {java.nio.file.FileVisitor
-     {preVisitDirectory  [[this p attrs]]
-      postVisitDirectory [[this p attrs]]
-      visitFile          [[this p attrs]]}
+   {java.lang.Object
+    {toString [[this]]}
+    java.nio.file.FileVisitor
+    {preVisitDirectory  [[this p attrs]]
+     postVisitDirectory [[this p attrs]]
+     visitFile          [[this p attrs]]}
 
-     java.io.FileFilter
-     {accept [[this f]]}
+    java.io.FileFilter
+    {accept [[this f]]}
 
-     java.io.FilenameFilter
-     {accept [[this f s]]}
+    java.io.FilenameFilter
+    {accept [[this f s]]}
 
-     clojure.lang.Associative
-     {containsKey [[this k]]
-      entryAt     [[this k]]
-      assoc       [[this k v]]}
+    clojure.lang.Associative
+    {containsKey [[this k]]
+     entryAt     [[this k]]
+     assoc       [[this k v]]}
 
-     clojure.lang.ILookup
-     {valAt [[this k] [this k default]]}
+    clojure.lang.ILookup
+    {valAt [[this k] [this k default]]}
 
-     java.util.Map$Entry
-     {getKey [[this]]
-      getValue [[this]]}
+    java.util.Map$Entry
+    {getKey [[this]]
+     getValue [[this]]}
 
-     clojure.lang.IFn
-     {applyTo [[this arglist]]
-      invoke  [[this]
-               [this a1]
-               [this a1 a2]
-               [this a1 a2 a3]
-               [this a1 a2 a3 a4]
-               [this a1 a2 a3 a4 a5]
-               [this a1 a2 a3 a4 a5 a6]
-               [this a1 a2 a3 a4 a5 a6 a7]
-               [this a1 a2 a3 a4 a5 a6 a7 a8]
-               [this a1 a2 a3 a4 a5 a6 a7 a8 a9]
-               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10]
-               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11]
-               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12]
-               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13]
-               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14]
-               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15]
-               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16]
-               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17]
-               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18]
-               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19]
-               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19 a20]
-               [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19 a20 varargs]]}
+    clojure.lang.IFn
+    {applyTo [[this arglist]]
+     invoke  [[this]
+              [this a1]
+              [this a1 a2]
+              [this a1 a2 a3]
+              [this a1 a2 a3 a4]
+              [this a1 a2 a3 a4 a5]
+              [this a1 a2 a3 a4 a5 a6]
+              [this a1 a2 a3 a4 a5 a6 a7]
+              [this a1 a2 a3 a4 a5 a6 a7 a8]
+              [this a1 a2 a3 a4 a5 a6 a7 a8 a9]
+              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10]
+              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11]
+              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12]
+              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13]
+              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14]
+              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15]
+              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16]
+              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17]
+              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18]
+              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19]
+              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19 a20]
+              [this a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19 a20 varargs]]}
 
-     clojure.lang.IPersistentCollection
-     {count [[this]]
-      cons  [[this x]]
-      empty [[this]]
-      equiv [[this x]]}
+    clojure.lang.IPersistentCollection
+    {count [[this]]
+     cons  [[this x]]
+     empty [[this]]
+     equiv [[this x]]}
 
-     clojure.lang.IReduce
-     {reduce [[this f]]}
+    clojure.lang.IReduce
+    {reduce [[this f]]}
 
-     clojure.lang.IReduceInit
-     {reduce [[this f initial]]}
+    clojure.lang.IReduceInit
+    {reduce [[this f initial]]}
 
-     clojure.lang.IKVReduce
-     {kvreduce [[this f initial]]}
+    clojure.lang.IKVReduce
+    {kvreduce [[this f initial]]}
 
-     clojure.lang.Indexed
-     {nth [[this n] [this n not-found]]}
+    clojure.lang.Indexed
+    {nth [[this n] [this n not-found]]}
 
-     clojure.lang.IPersistentMap
-     {assocEx [[this k v]]
-      without [[this k]]}
+    clojure.lang.IPersistentMap
+    {assocEx [[this k v]]
+     without [[this k]]}
 
-     clojure.lang.IPersistentStack
-     {peek [[this]]
-      pop  [[this]]}
+    clojure.lang.IPersistentStack
+    {peek [[this]]
+     pop  [[this]]}
 
-     clojure.lang.Reversible
-     {rseq [[this]]}
+    clojure.lang.Reversible
+    {rseq [[this]]}
 
-     clojure.lang.Seqable
-     {seq [[this]]}
+    clojure.lang.Seqable
+    {seq [[this]]}
 
-     java.lang.Iterable
-     {iterator [[this]]
-      forEach  [[this action]]}
+    java.lang.Iterable
+    {iterator [[this]]
+     forEach  [[this action]]}
 
-     java.util.Iterator
-     {hasNext [[this]]
-      next    [[this]]}}))
+    java.util.Iterator
+    {hasNext [[this]]
+     next    [[this]]}}))
diff --git a/test/babashka/reify_test.clj b/test/babashka/reify_test.clj
index 5cc24b1e..1e094f5e 100644
--- a/test/babashka/reify_test.clj
+++ b/test/babashka/reify_test.clj
@@ -2,8 +2,7 @@
   (:require
    [babashka.test-utils :as test-utils]
    [clojure.edn :as edn]
-   [clojure.test :as test :refer [deftest is testing]]
-   [clojure.string :as str]))
+   [clojure.test :as test :refer [deftest is testing]]))
 
 (defn bb [input & args]
   (edn/read-string
@@ -12,15 +11,15 @@
    (apply test-utils/bb (when (some? input) (str input)) (map str args))))
 
 (deftest file-filter-test
-  (testing "reify can handle multiple classes at once"
-    (is (true? (bb nil "
+  (is (true? (bb nil "
 (def filter-obj (reify java.io.FileFilter
-                  (accept [this f] (prn (.getPath f)) true)
-                  java.io.FilenameFilter
+                  (accept [this f] (prn (.getPath f)) true)))
+(def filename-filter-obj
+                 (reify java.io.FilenameFilter
                   (accept [this f name] (prn name) true)))
 (def s1 (with-out-str (.listFiles (clojure.java.io/file \".\") filter-obj)))
-(def s2 (with-out-str (.list (clojure.java.io/file \".\") filter-obj)))
-(and (pos? (count s1)) (pos? (count s2)))")))))
+(def s2 (with-out-str (.listFiles (clojure.java.io/file \".\") filename-filter-obj)))
+(and (pos? (count s1)) (pos? (count s2)))"))))
 
 (deftest reify-multiple-arities-test
   (testing "ILookup"
@@ -65,9 +64,4 @@
 (def m (reify Object
   (toString [_] (str :foo))))
 (hash m)
-"))))
-  (testing "toString still works when not overriding it"
-    (is (bb nil "
-(def m (reify Object))
-(str m)
-"))))
+")))))

From ea88219ad60d048c1d8a277eac13a79b8a159633 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 13 Mar 2021 12:47:25 +0100
Subject: [PATCH 072/145] Fix

---
 src/babashka/impl/reify.clj | 62 ++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/src/babashka/impl/reify.clj b/src/babashka/impl/reify.clj
index 43f20e45..fcf18c9b 100644
--- a/src/babashka/impl/reify.clj
+++ b/src/babashka/impl/reify.clj
@@ -27,41 +27,39 @@
                    (getProtocols [this]
                      protocols))]
     (list 'fn [{:keys '[interfaces methods protocols]}]
-          `(cond ~'(empty? interfaces) ~prelude
-                 ~'(> (count interfaces)
-                      1)
-                 (throw (new Exception "Babashka currently does not support reifying more than one interface."))
+          `(cond ~'(empty? interfaces) ~prelude ~'(> (count interfaces)
+                 1) (throw (new Exception "Babashka currently does not support reifying more than one interface."))
                  :else
-                 (case (.getName ~(with-meta '(first interfaces)
-                                    {:tag 'Class}))
-                   ~@(mapcat
-                      (fn [[clazz methods]]
-                        (list
-                         (str clazz)
-                         (concat prelude
-                                 (cons clazz
-                                       (mapcat
-                                        (fn [[meth arities]]
-                                          (map
-                                           (fn [arity]
-                                             (list meth arity
-                                                   (list*
-                                                    (list 'or (list 'get 'methods (list 'quote meth))
-                                                          `(throw (new Exception (str "Not implemented: "
-                                                                                      ~(str meth)))))
-                                                    arity)))
-                                           arities))
-                                        methods)))))
-                      methods)))))
+             (case (.getName ~(with-meta '(first interfaces)
+                                {:tag 'Class}))
+               ~@(mapcat
+                  (fn [[clazz methods]]
+                    (list
+                     (str clazz)
+                     (concat prelude
+                             (cons clazz
+                                   (mapcat
+                                    (fn [[meth arities]]
+                                      (map
+                                       (fn [arity]
+                                         (list meth arity
+                                               (list*
+                                                (list 'or (list 'get 'methods (list 'quote meth))
+                                                      `(throw (new Exception (str "Not implemented: "
+                                                                                  ~(str meth)))))
+                                                arity)))
+                                       arities))
+                                    methods)))))
+                  methods))))))
 
-  ;; (require 'clojure.pprint)
-  ;; (clojure.pprint/pprint
-  ;;  (macroexpand '(gen-reify-combos {java.nio.file.FileVisitor
-  ;;                                   {preVisitDirectory  [[this p attrs]]
-  ;;                                    postVisitDirectory [[this p attrs]]
-  ;;                                    visitFile          [[this p attrs]]}})))
+;; (require 'clojure.pprint)
+;; (clojure.pprint/pprint
+;;  (macroexpand '(gen-reify-combos {java.nio.file.FileVisitor
+;;                                   {preVisitDirectory  [[this p attrs]]
+;;                                    postVisitDirectory [[this p attrs]]
+;;                                    visitFile          [[this p attrs]]}})))
 
-  #_:clj-kondo/ignore)
+#_:clj-kondo/ignore
 (def reify-fn
   (gen-reify-combos
    {java.lang.Object

From a44f66e9a1e77a6261b511db32fd11d30b3b4804 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 13 Mar 2021 12:51:34 +0100
Subject: [PATCH 073/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25234304..6f884ed9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,13 +6,15 @@ For a list of breaking changes, check [here](#breaking-changes).
 
 ### TODO
 
-- Roll back `reify` changes in v0.2.13. See [sci#549](https://github.com/borkdude/sci/issues/549).
 - Add support for arm64 binaries
 
 ### Enhancements / fixes
 
 - Fix `print-method` when writing to stdout [#667](https://github.com/babashka/babashka/issues/667)
 - Fix interop with `System/out` [#754](https://github.com/babashka/babashka/issues/754)
+- Narrow `reify` to just one class. See discussion in [sci#549](https://github.com/borkdude/sci/issues/549)
+- Add preliminary support for `proxy` (for pathom3 smart maps) [sci#550](https://github.com/borkdude/sci/issues/550).
+
 
 ## v0.2.13
 

From ae047b5809a6710481f8651fb6ee434a3e3384bb Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 13 Mar 2021 14:59:44 +0100
Subject: [PATCH 074/145] Support this in proxy

---
 sci                         |  2 +-
 src/babashka/impl/proxy.clj | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sci b/sci
index 9dab6065..02409735 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit 9dab60653651e94bc535f8a753def10b708ff7e8
+Subproject commit 02409735ac3e085a407352ea3d0fbd29a3777816
diff --git a/src/babashka/impl/proxy.clj b/src/babashka/impl/proxy.clj
index ad8d8873..fd480745 100644
--- a/src/babashka/impl/proxy.clj
+++ b/src/babashka/impl/proxy.clj
@@ -12,18 +12,18 @@
   (case (.getName ^Class class)
     "clojure.lang.APersistentMap"
     (proxy [clojure.lang.APersistentMap] []
-      (iterator [] ((method-or-bust methods 'iterator)))
-      (containsKey [k] ((method-or-bust methods 'containsKey) k))
-      (entryAt [k] ((method-or-bust methods 'entryAt) k))
+      (iterator [] ((method-or-bust methods 'iterator) this))
+      (containsKey [k] ((method-or-bust methods 'containsKey) this k))
+      (entryAt [k] ((method-or-bust methods 'entryAt) this k))
       (valAt
-        ([k] ((method-or-bust methods 'valAt) k))
-        ([k default] ((method-or-bust methods 'valAt) k default)))
-      (cons [v] ((method-or-bust methods 'cons) v))
-      (count [] ((method-or-bust methods 'count)))
-      (assoc [k v] ((method-or-bust methods 'assoc) k v))
-      (without [k] ((method-or-bust methods 'without) k))
-      (seq [] ((method-or-bust methods 'seq))))
+        ([k] ((method-or-bust methods 'valAt) this k))
+        ([k default] ((method-or-bust methods 'valAt) this k default)))
+      (cons [v] ((method-or-bust methods 'cons) this v))
+      (count [] ((method-or-bust methods 'count) this))
+      (assoc [k v] ((method-or-bust methods 'assoc) this k v))
+      (without [k] ((method-or-bust methods 'without) this k))
+      (seq [] ((method-or-bust methods 'seq) this)))
     "clojure.lang.AMapEntry"
     (proxy [clojure.lang.AMapEntry] []
-      (key [] ((method-or-bust methods 'key)))
-      (val [] ((method-or-bust methods 'val))))))
+      (key [] ((method-or-bust methods 'key) this))
+      (val [] ((method-or-bust methods 'val) this)))))

From 6a911fc54f574c9acd2581e7045837448b781afb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wilker=20L=C3=BAcio?= <wilkerlucio@users.noreply.github.com>
Date: Sat, 13 Mar 2021 12:37:51 -0300
Subject: [PATCH 075/145] Augment proxy to fulfill custom maps interfaces
 (#755)

---
 src/babashka/impl/proxy.clj | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/babashka/impl/proxy.clj b/src/babashka/impl/proxy.clj
index fd480745..9a68eaad 100644
--- a/src/babashka/impl/proxy.clj
+++ b/src/babashka/impl/proxy.clj
@@ -8,22 +8,45 @@
   (or (get methods k)
       (throw (UnsupportedOperationException. "Method not implemented: " k))))
 
-(defn proxy-fn [{:keys [:class :methods]}]
+(defn method-or [methods k default]
+  (or (get methods k)
+      default))
+
+(defn proxy-fn [{:keys [class methods]}]
   (case (.getName ^Class class)
     "clojure.lang.APersistentMap"
-    (proxy [clojure.lang.APersistentMap] []
+    (proxy [clojure.lang.APersistentMap clojure.lang.IMeta clojure.lang.IObj] []
       (iterator [] ((method-or-bust methods 'iterator) this))
       (containsKey [k] ((method-or-bust methods 'containsKey) this k))
       (entryAt [k] ((method-or-bust methods 'entryAt) this k))
       (valAt
         ([k] ((method-or-bust methods 'valAt) this k))
         ([k default] ((method-or-bust methods 'valAt) this k default)))
-      (cons [v] ((method-or-bust methods 'cons) this v))
+      (cons [v]
+        (if-let [m (get methods 'cons)]
+          (m this v)
+          (proxy-super cons v)))
       (count [] ((method-or-bust methods 'count) this))
       (assoc [k v] ((method-or-bust methods 'assoc) this k v))
       (without [k] ((method-or-bust methods 'without) this k))
-      (seq [] ((method-or-bust methods 'seq) this)))
+      (seq [] ((method-or-bust methods 'seq) this))
+
+      (equiv [other]
+        (if-let [m (get methods 'equiv)]
+          (m this other)
+          (proxy-super equiv other)))
+      (empty [] ((method-or-bust methods 'empty) this))
+
+      (meta [] ((method-or methods 'meta nil) this))
+      (withMeta [meta] ((method-or methods 'withMeta this) this meta))
+
+      (toString []
+        (if-let [m (get methods 'toString)]
+          (m this)
+          (proxy-super toString))))
     "clojure.lang.AMapEntry"
     (proxy [clojure.lang.AMapEntry] []
       (key [] ((method-or-bust methods 'key) this))
-      (val [] ((method-or-bust methods 'val) this)))))
+      (val [] ((method-or-bust methods 'val) this))
+      (getKey [] ((method-or-bust methods 'getKey) this))
+      (getValue [] ((method-or-bust methods 'getValue) this)))))

From c0e512e3046e3ec3c9daa839ff5ad319025f31a6 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 13 Mar 2021 17:04:35 +0100
Subject: [PATCH 076/145] proxy

---
 sci                          |  2 +-
 src/babashka/impl/proxy.clj  | 76 +++++++++++++++++++-----------------
 test/babashka/proxy_test.clj | 15 ++++---
 3 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/sci b/sci
index 02409735..139df5af 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit 02409735ac3e085a407352ea3d0fbd29a3777816
+Subproject commit 139df5af5ab8e80a4988db45f1c7110ff40f3e8f
diff --git a/src/babashka/impl/proxy.clj b/src/babashka/impl/proxy.clj
index 9a68eaad..4dd06fe4 100644
--- a/src/babashka/impl/proxy.clj
+++ b/src/babashka/impl/proxy.clj
@@ -10,43 +10,47 @@
 
 (defn method-or [methods k default]
   (or (get methods k)
-      default))
+      (constantly default)))
 
-(defn proxy-fn [{:keys [class methods]}]
-  (case (.getName ^Class class)
-    "clojure.lang.APersistentMap"
-    (proxy [clojure.lang.APersistentMap clojure.lang.IMeta clojure.lang.IObj] []
-      (iterator [] ((method-or-bust methods 'iterator) this))
-      (containsKey [k] ((method-or-bust methods 'containsKey) this k))
-      (entryAt [k] ((method-or-bust methods 'entryAt) this k))
-      (valAt
-        ([k] ((method-or-bust methods 'valAt) this k))
-        ([k default] ((method-or-bust methods 'valAt) this k default)))
-      (cons [v]
-        (if-let [m (get methods 'cons)]
-          (m this v)
-          (proxy-super cons v)))
-      (count [] ((method-or-bust methods 'count) this))
-      (assoc [k v] ((method-or-bust methods 'assoc) this k v))
-      (without [k] ((method-or-bust methods 'without) this k))
-      (seq [] ((method-or-bust methods 'seq) this))
+(defn class-name [^Class clazz]
+  (.getName clazz))
 
-      (equiv [other]
-        (if-let [m (get methods 'equiv)]
-          (m this other)
-          (proxy-super equiv other)))
-      (empty [] ((method-or-bust methods 'empty) this))
+(defn proxy-fn [{:keys [class interfaces methods]}]
+  (let [interfaces (set (map class-name interfaces))]
+    (case [(class-name class) interfaces ]
+      ["clojure.lang.APersistentMap" #{"clojure.lang.IMeta" "clojure.lang.IObj"}]
+      (proxy [clojure.lang.APersistentMap clojure.lang.IMeta clojure.lang.IObj] []
+        (iterator [] ((method-or-bust methods 'iterator) this))
+        (containsKey [k] ((method-or-bust methods 'containsKey) this k))
+        (entryAt [k] ((method-or-bust methods 'entryAt) this k))
+        (valAt
+          ([k] ((method-or-bust methods 'valAt) this k))
+          ([k default] ((method-or-bust methods 'valAt) this k default)))
+        (cons [v]
+          (if-let [m (get methods 'cons)]
+            (m this v)
+            (proxy-super cons v)))
+        (count [] ((method-or-bust methods 'count) this))
+        (assoc [k v] ((method-or-bust methods 'assoc) this k v))
+        (without [k] ((method-or-bust methods 'without) this k))
+        (seq [] ((method-or-bust methods 'seq) this))
 
-      (meta [] ((method-or methods 'meta nil) this))
-      (withMeta [meta] ((method-or methods 'withMeta this) this meta))
+        (equiv [other]
+          (if-let [m (get methods 'equiv)]
+            (m this other)
+            (proxy-super equiv other)))
+        (empty [] ((method-or-bust methods 'empty) this))
 
-      (toString []
-        (if-let [m (get methods 'toString)]
-          (m this)
-          (proxy-super toString))))
-    "clojure.lang.AMapEntry"
-    (proxy [clojure.lang.AMapEntry] []
-      (key [] ((method-or-bust methods 'key) this))
-      (val [] ((method-or-bust methods 'val) this))
-      (getKey [] ((method-or-bust methods 'getKey) this))
-      (getValue [] ((method-or-bust methods 'getValue) this)))))
+        (meta [] ((method-or-bust methods 'meta) this))
+        (withMeta [meta] ((method-or-bust methods 'withMeta) this meta))
+
+        (toString []
+          (if-let [m (get methods 'toString)]
+            (m this)
+            (proxy-super toString))))
+      ["clojure.lang.AMapEntry" #{}]
+      (proxy [clojure.lang.AMapEntry] []
+        (key [] ((method-or-bust methods 'key) this))
+        (val [] ((method-or-bust methods 'val) this))
+        (getKey [] ((method-or-bust methods 'getKey) this))
+        (getValue [] ((method-or-bust methods 'getValue) this))))))
diff --git a/test/babashka/proxy_test.clj b/test/babashka/proxy_test.clj
index c59e0e71..e4213f10 100644
--- a/test/babashka/proxy_test.clj
+++ b/test/babashka/proxy_test.clj
@@ -21,14 +21,14 @@
      (defn proxy-deref-map
        {:added "1.0"}
        [m]
-       (proxy [clojure.lang.APersistentMap]
+       (proxy [clojure.lang.APersistentMap clojure.lang.IMeta clojure.lang.IObj]
            []
          (iterator []
            ::TODO)
          (containsKey [k] (contains? m k))
          (entryAt [k] (when (contains? m k) (proxy [clojure.lang.AMapEntry] []
                                               (key [] k)
-                                              (val [] (auto-deref(get m k))))))
+                                              (val [] (auto-deref (get m k))))))
          (valAt ([k] (auto-deref (get m k)))
            ([k default] (auto-deref (get m k default))))
          (cons [v] (proxy-deref-map (conj m v)))
@@ -37,7 +37,9 @@
          (without [k] (proxy-deref-map (dissoc m k)))
          (seq [] (map (fn [[k v]](proxy [clojure.lang.AMapEntry] []
                                    (key [] k)
-                                   (val [] (auto-deref (get m k))))) m))))
+                                   (val [] (auto-deref (get m k))))) m))
+         (withMeta [md] (proxy-deref-map (with-meta m md)))
+         (meta [] (meta m))))
      (let [m (proxy-deref-map
               {:a (delay 1)
                :b (delay 2)
@@ -54,10 +56,13 @@
             :d)
         (-> (dissoc m :a)
             (contains? :a))
-        (seq m)])))
+        (seq m)
+        (meta (with-meta m {:a 1}))
+        ])))
 
 (deftest APersistentMap-proxy-test
   (is (= [1 2 3 true [:c 3]
           5 3 5 false
-          '([:a 1] [:b 2] [:c 3])]
+          '([:a 1] [:b 2] [:c 3])
+          {:a 1}]
          (bb code))))

From a426cddd4a58dd527b6362ba4db57d534acca4bb Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 13 Mar 2021 17:25:24 +0100
Subject: [PATCH 077/145] proxy + protocols

---
 sci                          |  2 +-
 src/babashka/impl/proxy.clj  | 10 ++++++++--
 test/babashka/proxy_test.clj | 18 +++++++++++++-----
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/sci b/sci
index 139df5af..bf0fc870 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit 139df5af5ab8e80a4988db45f1c7110ff40f3e8f
+Subproject commit bf0fc870e5d9060ea79dd49594487d600bb64571
diff --git a/src/babashka/impl/proxy.clj b/src/babashka/impl/proxy.clj
index 4dd06fe4..790a358b 100644
--- a/src/babashka/impl/proxy.clj
+++ b/src/babashka/impl/proxy.clj
@@ -15,11 +15,17 @@
 (defn class-name [^Class clazz]
   (.getName clazz))
 
-(defn proxy-fn [{:keys [class interfaces methods]}]
+(defn proxy-fn [{:keys [class interfaces protocols methods]}]
   (let [interfaces (set (map class-name interfaces))]
     (case [(class-name class) interfaces ]
       ["clojure.lang.APersistentMap" #{"clojure.lang.IMeta" "clojure.lang.IObj"}]
-      (proxy [clojure.lang.APersistentMap clojure.lang.IMeta clojure.lang.IObj] []
+      (proxy [clojure.lang.APersistentMap clojure.lang.IMeta clojure.lang.IObj sci.impl.types.IReified] []
+        (getInterfaces []
+          interfaces)
+        (getMethods []
+          methods)
+        (getProtocols []
+          protocols)
         (iterator [] ((method-or-bust methods 'iterator) this))
         (containsKey [k] ((method-or-bust methods 'containsKey) this k))
         (entryAt [k] ((method-or-bust methods 'entryAt) this k))
diff --git a/test/babashka/proxy_test.clj b/test/babashka/proxy_test.clj
index e4213f10..bfd05534 100644
--- a/test/babashka/proxy_test.clj
+++ b/test/babashka/proxy_test.clj
@@ -12,6 +12,8 @@
 
 (def code
   '(do
+     (require '[clojure.core.protocols])
+     (require '[clojure.datafy :as d])
      (defn auto-deref
        "If value implements IDeref, deref it, otherwise return original."
        [x]
@@ -21,7 +23,7 @@
      (defn proxy-deref-map
        {:added "1.0"}
        [m]
-       (proxy [clojure.lang.APersistentMap clojure.lang.IMeta clojure.lang.IObj]
+       (proxy [clojure.lang.APersistentMap clojure.lang.IMeta clojure.lang.IObj clojure.core.protocols.Datafiable]
            []
          (iterator []
            ::TODO)
@@ -39,7 +41,9 @@
                                    (key [] k)
                                    (val [] (auto-deref (get m k))))) m))
          (withMeta [md] (proxy-deref-map (with-meta m md)))
-         (meta [] (meta m))))
+         (meta [] (meta m))
+
+         (datafy [] {:datafied true})))
      (let [m (proxy-deref-map
               {:a (delay 1)
                :b (delay 2)
@@ -58,11 +62,15 @@
             (contains? :a))
         (seq m)
         (meta (with-meta m {:a 1}))
-        ])))
+        (d/datafy m)
+        ,])))
+
+(require 'clojure.pprint)
 
 (deftest APersistentMap-proxy-test
   (is (= [1 2 3 true [:c 3]
           5 3 5 false
           '([:a 1] [:b 2] [:c 3])
-          {:a 1}]
-         (bb code))))
+          {:a 1}
+          {:datafied true}]
+         (bb (with-out-str (clojure.pprint/pprint code))))))

From 7c608452b56ebcea87f085fc07ce7c54364bae0d Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 13 Mar 2021 17:30:08 +0100
Subject: [PATCH 078/145] clean [skip ci]

---
 src/babashka/impl/proxy.clj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/babashka/impl/proxy.clj b/src/babashka/impl/proxy.clj
index 790a358b..27dbd0dd 100644
--- a/src/babashka/impl/proxy.clj
+++ b/src/babashka/impl/proxy.clj
@@ -8,10 +8,6 @@
   (or (get methods k)
       (throw (UnsupportedOperationException. "Method not implemented: " k))))
 
-(defn method-or [methods k default]
-  (or (get methods k)
-      (constantly default)))
-
 (defn class-name [^Class clazz]
   (.getName clazz))
 

From 7262e1e70931b0eeec715972aeb3d68edb5ae550 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 13 Mar 2021 17:30:54 +0100
Subject: [PATCH 079/145] note [skip ci]

---
 src/babashka/impl/proxy.clj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/babashka/impl/proxy.clj b/src/babashka/impl/proxy.clj
index 27dbd0dd..31ed118d 100644
--- a/src/babashka/impl/proxy.clj
+++ b/src/babashka/impl/proxy.clj
@@ -14,6 +14,7 @@
 (defn proxy-fn [{:keys [class interfaces protocols methods]}]
   (let [interfaces (set (map class-name interfaces))]
     (case [(class-name class) interfaces ]
+      ;; This combination is used by pathom3
       ["clojure.lang.APersistentMap" #{"clojure.lang.IMeta" "clojure.lang.IObj"}]
       (proxy [clojure.lang.APersistentMap clojure.lang.IMeta clojure.lang.IObj sci.impl.types.IReified] []
         (getInterfaces []

From c79d48cdde3bd9599759ae0cedb5078014442601 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 13 Mar 2021 17:49:19 +0100
Subject: [PATCH 080/145] Fix proxy exception

---
 src/babashka/impl/proxy.clj | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/babashka/impl/proxy.clj b/src/babashka/impl/proxy.clj
index 31ed118d..ad3aaba8 100644
--- a/src/babashka/impl/proxy.clj
+++ b/src/babashka/impl/proxy.clj
@@ -6,7 +6,7 @@
 
 (defn method-or-bust [methods k]
   (or (get methods k)
-      (throw (UnsupportedOperationException. "Method not implemented: " k))))
+      (throw (UnsupportedOperationException. (str "Method not implemented: " k)))))
 
 (defn class-name [^Class clazz]
   (.getName clazz))
@@ -27,7 +27,8 @@
         (containsKey [k] ((method-or-bust methods 'containsKey) this k))
         (entryAt [k] ((method-or-bust methods 'entryAt) this k))
         (valAt
-          ([k] ((method-or-bust methods 'valAt) this k))
+          ([k]
+           ((method-or-bust methods 'valAt) this k))
           ([k default] ((method-or-bust methods 'valAt) this k default)))
         (cons [v]
           (if-let [m (get methods 'cons)]

From 0b332431d355f2244f6a19cd6f6efa8efdc648de Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 13 Mar 2021 18:08:36 +0100
Subject: [PATCH 081/145] Fix proxy instance check

---
 sci                          | 2 +-
 src/babashka/impl/proxy.clj  | 4 ++--
 test/babashka/proxy_test.clj | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sci b/sci
index bf0fc870..a10c28f0 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit bf0fc870e5d9060ea79dd49594487d600bb64571
+Subproject commit a10c28f012075a98dedb06f8158341a1b7baea9a
diff --git a/src/babashka/impl/proxy.clj b/src/babashka/impl/proxy.clj
index ad3aaba8..4ebfba60 100644
--- a/src/babashka/impl/proxy.clj
+++ b/src/babashka/impl/proxy.clj
@@ -12,8 +12,8 @@
   (.getName clazz))
 
 (defn proxy-fn [{:keys [class interfaces protocols methods]}]
-  (let [interfaces (set (map class-name interfaces))]
-    (case [(class-name class) interfaces ]
+  (let [interface-names (set (map class-name interfaces))]
+    (case [(class-name class) interface-names]
       ;; This combination is used by pathom3
       ["clojure.lang.APersistentMap" #{"clojure.lang.IMeta" "clojure.lang.IObj"}]
       (proxy [clojure.lang.APersistentMap clojure.lang.IMeta clojure.lang.IObj sci.impl.types.IReified] []
diff --git a/test/babashka/proxy_test.clj b/test/babashka/proxy_test.clj
index bfd05534..496f6449 100644
--- a/test/babashka/proxy_test.clj
+++ b/test/babashka/proxy_test.clj
@@ -63,6 +63,8 @@
         (seq m)
         (meta (with-meta m {:a 1}))
         (d/datafy m)
+        (instance? clojure.lang.APersistentMap m)
+        (instance? java.io.FilenameFilter m)
         ,])))
 
 (require 'clojure.pprint)
@@ -72,5 +74,7 @@
           5 3 5 false
           '([:a 1] [:b 2] [:c 3])
           {:a 1}
-          {:datafied true}]
+          {:datafied true}
+          true
+          false]
          (bb (with-out-str (clojure.pprint/pprint code))))))

From 0737e951a0718a10396f5bb5bd50fe56da541a2e Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 13 Mar 2021 23:35:35 +0100
Subject: [PATCH 082/145] fs: Windows updates

---
 fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs b/fs
index f4e614b3..01bc52cd 160000
--- a/fs
+++ b/fs
@@ -1 +1 @@
-Subproject commit f4e614b3c9067bcff29deb6bd7dcc0d2a02383d7
+Subproject commit 01bc52cd73c953879e6f409ef47d3779f8c5961b

From d13f1295f165374790ec85224e7241c733c79ea0 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 13 Mar 2021 23:36:26 +0100
Subject: [PATCH 083/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f884ed9..da6fc3d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,10 @@ For a list of breaking changes, check [here](#breaking-changes).
 - Narrow `reify` to just one class. See discussion in [sci#549](https://github.com/borkdude/sci/issues/549)
 - Add preliminary support for `proxy` (for pathom3 smart maps) [sci#550](https://github.com/borkdude/sci/issues/550).
 
+Babashka.fs:
+
+- Fix globbing on Windows
+- Fix Windows tests
 
 ## v0.2.13
 

From aacbcc3602f68b8cc3af357fa21a325a6b13d1de Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 14 Mar 2021 17:38:04 +0100
Subject: [PATCH 084/145] Add java.util.regex.Matcher to increase compatibility
 with version-clj.

---
 src/babashka/impl/classes.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/babashka/impl/classes.clj b/src/babashka/impl/classes.clj
index aea63a1e..9907d39d 100644
--- a/src/babashka/impl/classes.clj
+++ b/src/babashka/impl/classes.clj
@@ -219,7 +219,7 @@
           java.util.jar.JarFile$JarFileEntry
           java.util.stream.Stream
           java.util.Random
-          ;; java.util.regex.Matcher
+          java.util.regex.Matcher
           java.util.regex.Pattern
           java.util.Base64
           java.util.Base64$Decoder

From 1d3392e60e18d744fc6da90a7b04f4617fce2e33 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 14 Mar 2021 18:34:12 +0100
Subject: [PATCH 085/145] Reduce size

---
 src/babashka/impl/classes.clj | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/babashka/impl/classes.clj b/src/babashka/impl/classes.clj
index 9907d39d..58a2843c 100644
--- a/src/babashka/impl/classes.clj
+++ b/src/babashka/impl/classes.clj
@@ -8,6 +8,7 @@
   (cond->
       `{clojure.lang.LineNumberingPushbackReader {:allPublicConstructors true
                                                   :allPublicMethods true}
+
         java.lang.Thread
         {:allPublicConstructors true
          ;; generated with `public-declared-method-names`, see in
@@ -72,6 +73,10 @@
                    {:name "toURI"}]}
         java.util.Arrays
         {:methods [{:name "copyOf"}]}
+        java.util.regex.Matcher
+        {:methods [{:name "find"}
+                   {:name "start"}
+                   {:name "end"}]}
         ;; this fixes clojure.lang.Reflector for Java 11
         java.lang.reflect.AccessibleObject
         {:methods [{:name "canAccess"}]}}
@@ -219,7 +224,6 @@
           java.util.jar.JarFile$JarFileEntry
           java.util.stream.Stream
           java.util.Random
-          java.util.regex.Matcher
           java.util.regex.Pattern
           java.util.Base64
           java.util.Base64$Decoder

From db908004c78c03317d3c67c8f1d8eff1d158f5aa Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 14 Mar 2021 18:43:06 +0100
Subject: [PATCH 086/145] Revert "Reduce size"

This reverts commit 1d3392e60e18d744fc6da90a7b04f4617fce2e33.
---
 src/babashka/impl/classes.clj | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/babashka/impl/classes.clj b/src/babashka/impl/classes.clj
index 58a2843c..9907d39d 100644
--- a/src/babashka/impl/classes.clj
+++ b/src/babashka/impl/classes.clj
@@ -8,7 +8,6 @@
   (cond->
       `{clojure.lang.LineNumberingPushbackReader {:allPublicConstructors true
                                                   :allPublicMethods true}
-
         java.lang.Thread
         {:allPublicConstructors true
          ;; generated with `public-declared-method-names`, see in
@@ -73,10 +72,6 @@
                    {:name "toURI"}]}
         java.util.Arrays
         {:methods [{:name "copyOf"}]}
-        java.util.regex.Matcher
-        {:methods [{:name "find"}
-                   {:name "start"}
-                   {:name "end"}]}
         ;; this fixes clojure.lang.Reflector for Java 11
         java.lang.reflect.AccessibleObject
         {:methods [{:name "canAccess"}]}}
@@ -224,6 +219,7 @@
           java.util.jar.JarFile$JarFileEntry
           java.util.stream.Stream
           java.util.Random
+          java.util.regex.Matcher
           java.util.regex.Pattern
           java.util.Base64
           java.util.Base64$Decoder

From 4229cab9b4d26adf58554419c787cb3a8c90f513 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 14 Mar 2021 21:04:55 +0100
Subject: [PATCH 087/145] Update version-clj tests

---
 deps.edn                                      |   2 +-
 .../lib_tests/version_clj/compare_test.cljc   |  18 +++-
 .../lib_tests/version_clj/core_test.cljc      | 100 ++++++++++++++----
 .../lib_tests/version_clj/split_test.cljc     |  76 ++++++++++---
 4 files changed, 158 insertions(+), 38 deletions(-)

diff --git a/deps.edn b/deps.edn
index 2e51bc26..79818b9d 100644
--- a/deps.edn
+++ b/deps.edn
@@ -69,7 +69,7 @@
                          honeysql/honeysql {:mvn/version "1.0.444"}
                          minimallist/minimallist {:mvn/version "0.0.6"}
                          circleci/bond {:mvn/version "0.4.0"}
-                         version-clj/version-clj {:mvn/version "0.1.2"}
+                         version-clj/version-clj {:mvn/version "2.0.1"}
                          gaka/gaka {:mvn/version "0.3.0"}
                          failjure/failjure {:mvn/version "2.1.1"}}}
            :clj-nvd
diff --git a/test-resources/lib_tests/version_clj/compare_test.cljc b/test-resources/lib_tests/version_clj/compare_test.cljc
index b4df372a..c7ac75df 100644
--- a/test-resources/lib_tests/version_clj/compare_test.cljc
+++ b/test-resources/lib_tests/version_clj/compare_test.cljc
@@ -1,9 +1,10 @@
 (ns version-clj.compare-test
-  (:require [clojure.test :refer [deftest are]]
+  (:require #?(:clj [clojure.test :refer [deftest are]]
+               :cljs [cljs.test :refer-macros [deftest are]])
             [version-clj.compare :refer [version-compare]]))
 
 (deftest t-version-compare
-  (are [v0 v1 r] (= (version-compare v0 v1) r)
+  (are [v0 v1 r] (= r (version-compare v0 v1))
        ;; Numeric Comparison
        "1.0.0"          "1.0.0"           0
        "1.0.0"          "1.0"             0
@@ -36,6 +37,19 @@
        "1.0-RC5"        "1.0-RC20"       -1
        "1.0-RC11"       "1.0-RC6"         1
 
+       ;; Comparison nested vs. value
+       "1.0.0"          "1.0-1.0"        -1
+       "1.0-1.0"        "1.0.0"           1
+       "1.0-0.0"        "1.0.0"           0
+       "1.0.0"          "1.0-0.0"         0
+       "1.x.0"          "1.x-1.0"        -1
+       "1.x-1.0"        "1.x.0"           1
+       "1.0-612"        "1.0.613"        -1
+
+       ;; Numbers are newer than strings
+       "1.x.1"          "1.0.1"          -1
+       "1.0.1"          "1.x.1"           1
+
        ;; Releases are newer than SNAPSHOTs
        "1.0.0"          "1.0.0-SNAPSHOT"  1
        "1.0.0-SNAPSHOT" "1.0.0-SNAPSHOT"  0
diff --git a/test-resources/lib_tests/version_clj/core_test.cljc b/test-resources/lib_tests/version_clj/core_test.cljc
index 691aea8a..370e58a9 100644
--- a/test-resources/lib_tests/version_clj/core_test.cljc
+++ b/test-resources/lib_tests/version_clj/core_test.cljc
@@ -1,25 +1,81 @@
 (ns version-clj.core-test
-  (:require [clojure.test :refer [deftest are]]
-            [version-clj.core :refer [snapshot? qualified?]]))
+  (:require #?(:clj [clojure.test :refer [deftest is are]]
+               :cljs [cljs.test :refer-macros [deftest is are]])
+            [version-clj.core :as v]))
 
-(deftest t-snapshot
-  (are [v r] (= (boolean (snapshot? v)) r)
-       "1.0.0"                  false
-       "SNAPSHOT"               true
-       "1-SNAPSHOT"             true
-       "1.0-SNAPSHOT"           true
-       "1.0-SNAPSHOT.2"         true
-       "1.0-NOSNAPSHOT"         false))
+(deftest t-snapshot?
+  (are [v r] (= r (boolean (v/snapshot? v)))
+    "1.0.0"                  false
+    "SNAPSHOT"               true
+    "1-SNAPSHOT"             true
+    "1.0-SNAPSHOT"           true
+    "1.0-SNAPSHOT.2"         true
+    "1.0-NOSNAPSHOT"         false))
 
-(deftest t-qualified
-  (are [v r] (= (boolean (qualified? v)) r)
-       "1.0.0"                  false
-       "SNAPSHOT"               true
-       "1-SNAPSHOT"             true
-       "1.0-SNAPSHOT"           true
-       "1.0-SNAPSHOT.2"         true
-       "1.0-NOSNAPSHOT"         true
-       "1.x.2"                  false
-       "1.2y"                   true
-       "1.y2"                   false
-       "1.y"                    false))
+(deftest t-qualified?
+  (are [v r] (= r (boolean (v/qualified? v)))
+    "1.0.0"                  false
+    "SNAPSHOT"               true
+    "SNAPSHOT2"              true
+    "1-SNAPSHOT"             true
+    "1.0-SNAPSHOT"           true
+    "1.0-SNAPSHOT.2"         true
+    "1.0-NOSNAPSHOT"         true
+    "1.0-NOSNAPSHOT.1"       true
+    "1.0-NOSNAPSHOT.1.1"     true
+    "1.0-NOSNAPSHOT1.1"      true
+    "0.5.3-alpha.1.pre.0"    true
+    "1.x.2"                  false
+    "1.2y"                   false
+    "1.y2"                   false
+    "1.y"                    false))
+
+(let [v0 "1.0.0-SNAPSHOT"
+      v1 "1.0.0"
+      v2 "1.0.1-RC"
+      v3 "1.0.1"
+      ordered [v0 v1 v2 v3]]
+  (deftest t-version-sort
+    (is (= ordered (v/version-sort (shuffle ordered))))
+    (is (= (map v/version->seq ordered)
+           (v/version-seq-sort (map v/version->seq ordered)))))
+
+  (deftest t-version-compare
+    (is (pos? (v/version-compare v1 v0)))
+    (is (neg? (v/version-compare v0 v1)))
+    (is (zero? (v/version-compare v0 v0)))
+    (is (v/older? v0 v1))
+    (is (v/newer? v1 v0))
+    (is (v/older-or-equal? v0 v1))
+    (is (v/older-or-equal? v0 v0))
+    (is (v/newer-or-equal? v1 v0))
+    (is (v/newer-or-equal? v0 v0)))
+
+  (deftest t-version-seq-compare
+    (is (pos? (v/version-seq-compare
+                (v/version->seq v1)
+                (v/version->seq v0))))
+    (is (neg? (v/version-seq-compare
+                (v/version->seq v0)
+                (v/version->seq v1))))
+    (is (zero? (v/version-seq-compare
+                 (v/version->seq v0)
+                 (v/version->seq v0))))))
+
+(deftest t-parse
+  (let [s "1.0.1", version (v/parse s)]
+    (is (= [[1 0 1]] (:version version)))
+    (is (= #{} (:qualifiers version)))
+    (is (not (:snapshot? version)))
+    (is (not (:qualified? version))))
+  (let [s "1.0.1-RC1-SNAPSHOT", version (v/parse s)]
+    (is (= [[1 0 1] [["rc" 1] "snapshot"]] (:version version)))
+    (is (= #{"rc" "snapshot"} (:qualifiers version)))
+    (is (:snapshot? version))
+    (is (:qualified? version)))
+  (let [s "1.0.1"]
+    (is (= (v/parse s) (v/parse (v/version->seq s))))))
+
+(deftest t-version-and-qualifier-data
+  (is (= [1 0 1] (v/version-data "1.0.1-RC")))
+  (is (= ["rc"] (v/qualifier-data "1.0.1-RC"))))
diff --git a/test-resources/lib_tests/version_clj/split_test.cljc b/test-resources/lib_tests/version_clj/split_test.cljc
index 1216b134..51cac090 100644
--- a/test-resources/lib_tests/version_clj/split_test.cljc
+++ b/test-resources/lib_tests/version_clj/split_test.cljc
@@ -1,22 +1,72 @@
 (ns version-clj.split-test
-  (:require [clojure.test :refer [deftest are is]]
+  (:require #?(:clj [clojure.test :refer [deftest testing are is]]
+               :cljs [cljs.test :refer-macros [deftest testing are is]])
             [version-clj.split :refer [version->seq]]))
 
+(deftest t-split-once-sanity-check
+  (let [split-once @#'version-clj.split/split-once
+        rx #"(^|(?<=\d)|-)(?=alpha)"]
+    (are [in out] (= out (split-once rx in))
+         "1-alpha2.2"             ["1" "alpha2.2"]
+         "alpha"                  ["" "alpha"]
+         "1alpha"                 ["1" "alpha"]
+         "0.0.3-alpha.8+oryOS.15" ["0.0.3" "alpha.8+oryOS.15"])))
+
 (deftest t-split
-  (are [version v] (= (version->seq version) v)
-       "1.0.0"          [[1 0 0]]
-       "1.0"            [[1 0]]
-       "1"              [[1]]
-       "1a"             [[1] ["a"]]
-       "1-a"            [[1] ["a"]]
-       "1.0.1-SNAPSHOT" [[1 0 1] ["snapshot"]]
-       "1.0.1-alpha2"   [[1 0 1] ["alpha" 2]]
-       "11.2.0.3.0"     [[11 2 0 3 0]]
-       "1.0-1-0.2-RC"   [[1 [0 1 0] 2] ["rc"]]))
+  (are [version v] (= v (version->seq version))
+       "1.0.0"                  [[1 0 0]]
+       "1.0"                    [[1 0]]
+       "1"                      [[1]]
+       "1a"                     [[1] ["a"]]
+       "1-a"                    [[1] ["a"]]
+       "1.0.1-SNAPSHOT"         [[1 0 1] ["snapshot"]]
+       "1.0.1-alpha2"           [[1 0 1] ["alpha" 2]]
+       "11.2.0.3.0"             [[11 2 0 3 0]]
+       "1.0-1-0.2-RC"           [[1 [0 1 0] 2] ["rc"]]
+       "1.0-612"                [[1 0] [612]]
+       "alpha"                  [[] ["alpha"]]
+       "alpha-2"                [[] ["alpha" 2]]
+       "1.alpha"                [[1] ["alpha"]]
+       "1.alpha.2"              [[1] ["alpha" 2]]
+       "1-alpha.2"              [[1] ["alpha" 2]]
+       "1-alpha.2.2"            [[1] ["alpha" 2 2]]
+       "1-alpha2.2"             [[1] [["alpha" 2] 2]]
+       "1.alpha-1.0"            [[1] ["alpha" [1 0]]]
+       "0.5.0-alpha.1"          [[0 5 0] ["alpha" 1]]
+       "0.5.0-alpha.1"          [[0 5 0] ["alpha" 1]]
+       "0.0.3-alpha.8+oryOS.15" [[0 0 3] ["alpha" [8 "+oryos"] 15]]
+       ))
+
+(deftest t-split-without-qualifiers
+  (testing "well-behaving."
+    (are [version] (= (version->seq version)
+                        (version->seq version {:qualifiers {}}))
+         "1.0.0"
+         "1.0"
+         "1"
+         "1-a"
+         "1.0.1-SNAPSHOT"
+         "1.0.1-alpha2"
+         "11.2.0.3.0"
+         "1.0-1-0.2-RC"
+         "1-alpha.2"
+         "1-alpha.2.2"
+         "1-alpha2.2"
+         "0.5.0-alpha.1"
+         "0.5.0-alpha.1"
+         "0.0.3-alpha.8+oryOS.15"))
+  (testing "deviants."
+    (are [version v] (= v (version->seq version {:qualifiers {}}))
+         "alpha"                  [["alpha"]]
+         "alpha-2"                [["alpha"] [2]]
+         "1a"                     [[1 "a"]]
+         "1.alpha"                [[1 "alpha"]]
+         "1.alpha.2"              [[1 "alpha" 2]]
+         "1.alpha-1.0"            [[1 ["alpha" 1] 0]])))
 
 (deftest t-split-with-large-number
-  (is (= (version->seq "0.0.1-20141002100138")
-         [[0 0 1] [20141002100138]]))
+  (is (= [[0 0 1] [20141002100138]]
+         (version->seq "0.0.1-20141002100138")))
   #?(:clj
      (let [v (str Long/MAX_VALUE "12345")]
        (is (= (version->seq v) [[(bigint v)]])))))

From ab674f834848570c58fdc76fbcb82a52838786fa Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 14 Mar 2021 22:02:47 +0100
Subject: [PATCH 088/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da6fc3d4..c3b9649a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ For a list of breaking changes, check [here](#breaking-changes).
 - Fix interop with `System/out` [#754](https://github.com/babashka/babashka/issues/754)
 - Narrow `reify` to just one class. See discussion in [sci#549](https://github.com/borkdude/sci/issues/549)
 - Add preliminary support for `proxy` (for pathom3 smart maps) [sci#550](https://github.com/borkdude/sci/issues/550).
+- Support [version-clj](https://github.com/xsc/version-clj) v2.0.1 by adding `java.util.regex.Matcher` to the reflection config
 
 Babashka.fs:
 

From e048b30d02d246b81a1d13c56e54aba0c34a4cdb Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 14 Mar 2021 22:15:43 +0100
Subject: [PATCH 089/145] babashka.fs/copy-tree: create dir if needed

---
 fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs b/fs
index 01bc52cd..b1874607 160000
--- a/fs
+++ b/fs
@@ -1 +1 @@
-Subproject commit 01bc52cd73c953879e6f409ef47d3779f8c5961b
+Subproject commit b1874607ed8a06b6439778a28087f20b48db699d

From 14a1e839306e5ae5a209e28d2e1c8c0f2a2f022c Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 14 Mar 2021 22:16:14 +0100
Subject: [PATCH 090/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3b9649a..f0a7fade 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ Babashka.fs:
 
 - Fix globbing on Windows
 - Fix Windows tests
+- Create dest dir if needed in copy-tree
 
 ## v0.2.13
 

From 58532c76de852a10812f7a181106e8567040b433 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 15 Mar 2021 11:37:18 +0100
Subject: [PATCH 091/145] Better fix for fs/copy

---
 CHANGELOG.md | 1 +
 fs           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0a7fade..0b552357 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ For a list of breaking changes, check [here](#breaking-changes).
 ### TODO
 
 - Add support for arm64 binaries
+- :reload-all https://github.com/borkdude/sci/issues/552
 
 ### Enhancements / fixes
 
diff --git a/fs b/fs
index b1874607..d0394a19 160000
--- a/fs
+++ b/fs
@@ -1 +1 @@
-Subproject commit b1874607ed8a06b6439778a28087f20b48db699d
+Subproject commit d0394a1970d5d629204741d8d66107b54cc9c666

From 194fe2e2b2475e25754ccbe383244db58d96ad75 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 15 Mar 2021 11:37:48 +0100
Subject: [PATCH 092/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b552357..9435b2b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,7 @@ Babashka.fs:
 
 - Fix globbing on Windows
 - Fix Windows tests
-- Create dest dir if needed in copy-tree
+- Fix issue with copy-tree when dest dir doesn't exist yet
 
 ## v0.2.13
 

From 6c8f9a10385cf714171b694f4fa9c0aaa5ccf46b Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 15 Mar 2021 16:56:32 +0100
Subject: [PATCH 093/145] [#241] AArch64 linux binaries

---
 .circleci/config.yml     | 90 ++++++++++++++++++++++++++++++++++++++++
 .circleci/script/release |  4 +-
 2 files changed, 93 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5aeb3fe7..1e9752a1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -225,6 +225,95 @@ jobs:
           name: Publish artifact link to Slack
           command: |
             ./bb .circleci/script/publish_artifact.clj || true
+  linux-aarch64:
+    machine:
+      enabled: true
+      image: ubuntu-2004:202101-01
+    resource_class: arm.large
+    working_directory: ~/repo
+    environment:
+      LEIN_ROOT: "true"
+      GRAALVM_HOME: /home/circleci/graalvm-ce-java11-21.0.0
+      BABASHKA_PLATFORM: linux # used in release script
+      BABASHKA_ARCH: aarch64
+      BABASHKA_TEST_ENV: native
+      BABASHKA_XMX: "-J-Xmx6500m"
+    steps:
+      - checkout
+      - run:
+          name: "Pull Submodules"
+          command: |
+            git submodule init
+            git submodule update
+      - run:
+          name: "Short circuit on SNAPSHOT"
+          command: |
+            VERSION=$(cat resources/BABASHKA_VERSION)
+            if [[ "$VERSION" == *-SNAPSHOT ]]
+            then
+              circleci task halt
+            fi
+      - restore_cache:
+          keys:
+            - linux-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }}
+      - run:
+          name: Install Leiningen
+          command: |
+            sudo script/install-leiningen
+      - run:
+          name: Install Clojure
+          command: |
+            wget https://download.clojure.org/install/linux-install-1.10.1.447.sh
+            chmod +x linux-install-1.10.1.447.sh
+            sudo ./linux-install-1.10.1.447.sh
+      - run:
+          name: Install lsof
+          command: |
+            sudo apt-get install lsof
+      - run:
+          name: Install native dev tools
+          command: |
+            sudo apt-get update
+            sudo apt-get -y install gcc g++ zlib1g-dev
+      - run:
+          name: Download GraalVM
+          command: |
+            cd ~
+            if ! [ -d graalvm-ce-java11-21.0.0 ]; then
+              curl -O -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.0.0/graalvm-ce-java11-linux-aarch64-21.0.0.tar.gz
+              tar xzf graalvm-ce-java11-linux-aarch64-21.0.0.tar.gz
+            fi
+      - run:
+          name: Build binary
+          command: |
+            script/uberjar
+            script/compile
+          no_output_timeout: 30m
+      - run:
+          name: Run tests
+          command: |
+            script/test
+            script/run_lib_tests
+      - run:
+          name: Release
+          command: |
+            .circleci/script/release
+      - persist_to_workspace:
+          root: /tmp
+          paths:
+            - release
+      - save_cache:
+          paths:
+            - ~/.m2
+            - ~/graalvm-ce-java11-21.0.0
+          key: linux-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }}
+      - store_artifacts:
+          path: /tmp/release
+          destination: release
+      - run:
+          name: Publish artifact link to Slack
+          command: |
+            ./bb .circleci/script/publish_artifact.clj || true
   mac:
     macos:
       xcode: "12.0.0"
@@ -336,6 +425,7 @@ workflows:
       - linux
       - linux-static
       - mac
+      - linux-aarch64
       - deploy:
           filters:
             branches:
diff --git a/.circleci/script/release b/.circleci/script/release
index a9edaeff..557006e4 100755
--- a/.circleci/script/release
+++ b/.circleci/script/release
@@ -13,7 +13,9 @@ mkdir -p /tmp/bb_size
 
 ## release binary as tar.gz archive
 
-tar zcvf "babashka-$VERSION-$BABASHKA_PLATFORM-amd64.tar.gz" bb # bbk
+arch=${BABASHKA_ARCH:amd64}
+
+tar zcvf "babashka-$VERSION-$BABASHKA_PLATFORM-$arch.tar.gz" bb # bbk
 
 ## cleanup
 

From 126d2ff7287c398e488143422c7573337cf580a0 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 15 Mar 2021 17:21:17 +0100
Subject: [PATCH 094/145] Fix release script

---
 .circleci/script/release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/script/release b/.circleci/script/release
index 557006e4..092d7931 100755
--- a/.circleci/script/release
+++ b/.circleci/script/release
@@ -13,7 +13,7 @@ mkdir -p /tmp/bb_size
 
 ## release binary as tar.gz archive
 
-arch=${BABASHKA_ARCH:amd64}
+arch=${BABASHKA_ARCH:-amd64}
 
 tar zcvf "babashka-$VERSION-$BABASHKA_PLATFORM-$arch.tar.gz" bb # bbk
 

From 2749eb7149e75ef531e1ce53c0c31f07d91526dd Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 15 Mar 2021 17:24:15 +0100
Subject: [PATCH 095/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9435b2b5..b685929a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@ For a list of breaking changes, check [here](#breaking-changes).
 - Add support for arm64 binaries
 - :reload-all https://github.com/borkdude/sci/issues/552
 
+### New
+
+- Linux support for AArch64 [#241](https://github.com/babashka/babashka/issues/241). This means you can now run babashka on Raspberry Pi 64bit and Chromebooks with ARM 64-bit processors!
+
 ### Enhancements / fixes
 
 - Fix `print-method` when writing to stdout [#667](https://github.com/babashka/babashka/issues/667)

From fbcfb9a11898ff2052b0d74ae20a5b3fbeab9dc9 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 15 Mar 2021 21:46:03 +0100
Subject: [PATCH 096/145] Prepare install script [skip ci]

---
 install | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/install b/install
index a5d7bd0e..ca225b67 100755
--- a/install
+++ b/install
@@ -64,6 +64,11 @@ case "$(uname -s)" in
     Darwin*)    platform=macos;;
 esac
 
+case "$(uname -m)" in
+    aarch64)   arch=aarch64;;
+esac
+arch=${arch:-amd64}
+
 # Ugly ugly conversion of version to a comparable number
 IFS='.' read -ra VER <<< "$version"
 vernum=$(printf "%03d%03d%03d" "${VER[0]}" "${VER[1]}" "${VER[2]}")
@@ -76,16 +81,16 @@ else
   util="$(which tar) -zxf"
 fi
 
-download_url="https://github.com/babashka/babashka/releases/download/v$version/babashka-$version-$platform-amd64.zip"
+download_url="https://github.com/babashka/babashka/releases/download/v$version/babashka-$version-$platform-$arch.zip"
 
 mkdir -p "$download_dir"
 cd "$download_dir"
 echo -e "Downloading $download_url to $download_dir"
-rm -rf "babashka-$version-$platform-amd64."$ext
+rm -rf "babashka-$version-$platform-$arch."$ext
 rm -rf "bb"
-curl -o "babashka-$version-$platform-amd64."$ext -sL "https://github.com/babashka/babashka/releases/download/v$version/babashka-$version-$platform-amd64."$ext
-$util "babashka-$version-$platform-amd64."$ext
-rm "babashka-$version-$platform-amd64."$ext
+curl -o "babashka-$version-$platform-$arch."$ext -sL "https://github.com/babashka/babashka/releases/download/v$version/babashka-$version-$platform-$arch."$ext
+$util "babashka-$version-$platform-$arch."$ext
+rm "babashka-$version-$platform-$arch."$ext
 
 if [ "$download_dir" != "$install_dir" ]
 then

From ede9ed346692d8f9ec5652c1eacdbe5f0757cbc2 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 15 Mar 2021 22:10:01 +0100
Subject: [PATCH 097/145] sci: :reload-all

---
 CHANGELOG.md | 13 ++++++-------
 sci          |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b685929a..fd0c0106 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,11 +4,6 @@ For a list of breaking changes, check [here](#breaking-changes).
 
 ## Unreleased
 
-### TODO
-
-- Add support for arm64 binaries
-- :reload-all https://github.com/borkdude/sci/issues/552
-
 ### New
 
 - Linux support for AArch64 [#241](https://github.com/babashka/babashka/issues/241). This means you can now run babashka on Raspberry Pi 64bit and Chromebooks with ARM 64-bit processors!
@@ -17,8 +12,6 @@ For a list of breaking changes, check [here](#breaking-changes).
 
 - Fix `print-method` when writing to stdout [#667](https://github.com/babashka/babashka/issues/667)
 - Fix interop with `System/out` [#754](https://github.com/babashka/babashka/issues/754)
-- Narrow `reify` to just one class. See discussion in [sci#549](https://github.com/borkdude/sci/issues/549)
-- Add preliminary support for `proxy` (for pathom3 smart maps) [sci#550](https://github.com/borkdude/sci/issues/550).
 - Support [version-clj](https://github.com/xsc/version-clj) v2.0.1 by adding `java.util.regex.Matcher` to the reflection config
 
 Babashka.fs:
@@ -27,6 +20,12 @@ Babashka.fs:
 - Fix Windows tests
 - Fix issue with copy-tree when dest dir doesn't exist yet
 
+Sci:
+
+- Support `:reload-all` [#552](https://github.com/borkdude/sci/issues/552)
+- Narrow `reify` to just one class. See discussion in [sci#549](https://github.com/borkdude/sci/issues/549)
+- Add preliminary support for `proxy` (for pathom3 smart maps) [sci#550](https://github.com/borkdude/sci/issues/550).
+
 ## v0.2.13
 
 ### Enhancements / fixes
diff --git a/sci b/sci
index a10c28f0..ac4c05ee 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit a10c28f012075a98dedb06f8158341a1b7baea9a
+Subproject commit ac4c05eef8fa4245297002b81bc6dba45b30712a

From 2d81c3a8e352c86254e6f6cf68368bbdf8dc6948 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 15 Mar 2021 22:37:03 +0100
Subject: [PATCH 098/145] Add FileInputStream

---
 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 9907d39d..fbc2b0d4 100644
--- a/src/babashka/impl/classes.clj
+++ b/src/babashka/impl/classes.clj
@@ -92,6 +92,7 @@
           java.io.ByteArrayOutputStream
           java.io.Console
           java.io.File
+          java.io.FileInputStream
           java.io.FileFilter
           java.io.FilenameFilter
           java.io.FileNotFoundException

From ac2bc23365e12d61db1900caf97d0d40c4de00fc Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 15 Mar 2021 22:44:16 +0100
Subject: [PATCH 099/145] Fix tests

---
 deps.edn                      | 5 ++++-
 src/babashka/impl/classes.clj | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/deps.edn b/deps.edn
index 79818b9d..e4f4b7ef 100644
--- a/deps.edn
+++ b/deps.edn
@@ -71,7 +71,10 @@
                          circleci/bond {:mvn/version "0.4.0"}
                          version-clj/version-clj {:mvn/version "2.0.1"}
                          gaka/gaka {:mvn/version "0.3.0"}
-                         failjure/failjure {:mvn/version "2.1.1"}}}
+                         failjure/failjure {:mvn/version "2.1.1"}}
+            :classpath-overrides {org.clojure/clojure nil
+                                  org.clojure/spec.alpha nil
+                                  org.clojure/core.specs.alpha nil}}
            :clj-nvd
            {:extra-deps {clj-nvd/clj-nvd {:git/url "https://github.com/miikka/clj-nvd.git"
                                           :sha "f2ec98699e057a379baf170cb49cf7ad76874a70"}}
diff --git a/src/babashka/impl/classes.clj b/src/babashka/impl/classes.clj
index fbc2b0d4..9907d39d 100644
--- a/src/babashka/impl/classes.clj
+++ b/src/babashka/impl/classes.clj
@@ -92,7 +92,6 @@
           java.io.ByteArrayOutputStream
           java.io.Console
           java.io.File
-          java.io.FileInputStream
           java.io.FileFilter
           java.io.FilenameFilter
           java.io.FileNotFoundException

From 0635e228100a7827618b3a991543c041d2f4973f Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 15 Mar 2021 22:51:23 +0100
Subject: [PATCH 100/145] v0.2.14

---
 resources/BABASHKA_VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/BABASHKA_VERSION b/resources/BABASHKA_VERSION
index ebe52df8..645604fb 100644
--- a/resources/BABASHKA_VERSION
+++ b/resources/BABASHKA_VERSION
@@ -1 +1 @@
-0.2.14-SNAPSHOT
\ No newline at end of file
+0.2.14
\ No newline at end of file

From 7cf63245afeb0718a6714fcf90a7fac28ba790da Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 15 Mar 2021 22:55:17 +0100
Subject: [PATCH 101/145] v0.3.0

---
 CHANGELOG.md               | 8 +++++---
 resources/BABASHKA_VERSION | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd0c0106..37996d53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 For a list of breaking changes, check [here](#breaking-changes).
 
-## Unreleased
+## 0.3.0
 
 ### New
 
@@ -13,18 +13,20 @@ For a list of breaking changes, check [here](#breaking-changes).
 - Fix `print-method` when writing to stdout [#667](https://github.com/babashka/babashka/issues/667)
 - Fix interop with `System/out` [#754](https://github.com/babashka/babashka/issues/754)
 - Support [version-clj](https://github.com/xsc/version-clj) v2.0.1 by adding `java.util.regex.Matcher` to the reflection config
+- Distribute linux and macOS archives as `tar.gz`. The reason is that `unzip` is
+  not pre-installed on most unix-y systems. ([@grazfather](https://github.com/grazfather))
 
 Babashka.fs:
 
 - Fix globbing on Windows
 - Fix Windows tests
-- Fix issue with copy-tree when dest dir doesn't exist yet
+- Fix issue with `copy-tree` when dest dir doesn't exist yet
 
 Sci:
 
 - Support `:reload-all` [#552](https://github.com/borkdude/sci/issues/552)
 - Narrow `reify` to just one class. See discussion in [sci#549](https://github.com/borkdude/sci/issues/549)
-- Add preliminary support for `proxy` (for pathom3 smart maps) [sci#550](https://github.com/borkdude/sci/issues/550).
+- Add preliminary support for `proxy` (mainly to support pathom3 smart maps) [sci#550](https://github.com/borkdude/sci/issues/550).
 
 ## v0.2.13
 
diff --git a/resources/BABASHKA_VERSION b/resources/BABASHKA_VERSION
index 645604fb..0d91a54c 100644
--- a/resources/BABASHKA_VERSION
+++ b/resources/BABASHKA_VERSION
@@ -1 +1 @@
-0.2.14
\ No newline at end of file
+0.3.0

From 7e570bcfdd73d0f01a88ee1b0a5c48d222828584 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 15 Mar 2021 22:59:36 +0100
Subject: [PATCH 102/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37996d53..4a66f534 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,11 +22,19 @@ Babashka.fs:
 - Fix Windows tests
 - Fix issue with `copy-tree` when dest dir doesn't exist yet
 
+Thanks [@lread](https://github.com/lread) for his help on fixing issues with Windows.
+
 Sci:
 
 - Support `:reload-all` [#552](https://github.com/borkdude/sci/issues/552)
-- Narrow `reify` to just one class. See discussion in [sci#549](https://github.com/borkdude/sci/issues/549)
-- Add preliminary support for `proxy` (mainly to support pathom3 smart maps) [sci#550](https://github.com/borkdude/sci/issues/550).
+- Narrow `reify` to just one class. See discussion in
+  [sci#549](https://github.com/borkdude/sci/issues/549).
+- Add preliminary support for `proxy` (mainly to support pathom3 smart maps)
+  [sci#550](https://github.com/borkdude/sci/issues/550).
+
+Thanks to [@wilkerlucio](https://github.com/wilkerlucio) and
+  [@GreshamDanielStephens](https://github.com/GreshamDanielStephens) for their
+  help and discussions.
 
 ## v0.2.13
 

From be966927396708fac8ab941eb166d294f8d65689 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 15 Mar 2021 23:03:38 +0100
Subject: [PATCH 103/145] Fix aarch64 on CircleCI

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1e9752a1..3dafd774 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -255,7 +255,7 @@ jobs:
             fi
       - restore_cache:
           keys:
-            - linux-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }}
+            - linux-aarch64-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }}
       - run:
           name: Install Leiningen
           command: |
@@ -306,7 +306,7 @@ jobs:
           paths:
             - ~/.m2
             - ~/graalvm-ce-java11-21.0.0
-          key: linux-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }}
+          key: linux-aarch64-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }}
       - store_artifacts:
           path: /tmp/release
           destination: release

From dc3da33749ebb2063bd4c2629e94f31788e10e5b Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 15 Mar 2021 23:16:39 +0100
Subject: [PATCH 104/145] Version bump

---
 CHANGELOG.md                        | 3 +++
 resources/BABASHKA_RELEASED_VERSION | 2 +-
 resources/BABASHKA_VERSION          | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a66f534..ab92245e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,9 @@ For a list of breaking changes, check [here](#breaking-changes).
 
 - Linux support for AArch64 [#241](https://github.com/babashka/babashka/issues/241). This means you can now run babashka on Raspberry Pi 64bit and Chromebooks with ARM 64-bit processors!
 
+A major thanks to [CircleCI](https://circleci.com/) for enabling AArch64 support
+in the babashka organization.
+
 ### Enhancements / fixes
 
 - Fix `print-method` when writing to stdout [#667](https://github.com/babashka/babashka/issues/667)
diff --git a/resources/BABASHKA_RELEASED_VERSION b/resources/BABASHKA_RELEASED_VERSION
index f21e5a1f..0d91a54c 100644
--- a/resources/BABASHKA_RELEASED_VERSION
+++ b/resources/BABASHKA_RELEASED_VERSION
@@ -1 +1 @@
-0.2.13
\ No newline at end of file
+0.3.0
diff --git a/resources/BABASHKA_VERSION b/resources/BABASHKA_VERSION
index 0d91a54c..9f6605e0 100644
--- a/resources/BABASHKA_VERSION
+++ b/resources/BABASHKA_VERSION
@@ -1 +1 @@
-0.3.0
+0.3.1-SNAPSHOT
\ No newline at end of file

From 8a22a11b8d98ad9243580cc0093b40202463373b Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 15 Mar 2021 23:18:45 +0100
Subject: [PATCH 105/145] README [skip ci]

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f5729c17..fa84f910 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,9 @@
 
 ## Introduction
 
-Babashka is a native Clojure interpreter for scripting. Its main goal is to
-leverage Clojure in places where you would be using bash otherwise.
+Babashka is a native Clojure interpreter for scripting with fast startup. Its
+main goal is to leverage Clojure in places where you would be using bash
+otherwise.
 
 As one user described it:
 

From 95c53a9e49b636d6010e09295924b76dd3db1b0f Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 15 Mar 2021 23:23:34 +0100
Subject: [PATCH 106/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab92245e..65e3b16d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ For a list of breaking changes, check [here](#breaking-changes).
 - Linux support for AArch64 [#241](https://github.com/babashka/babashka/issues/241). This means you can now run babashka on Raspberry Pi 64bit and Chromebooks with ARM 64-bit processors!
 
 A major thanks to [CircleCI](https://circleci.com/) for enabling AArch64 support
-in the babashka organization.
+in the babashka organization and [GraalVM](http://graalvm.org/) for supporting this platform.
 
 ### Enhancements / fixes
 

From 7652295d84bb4313f92e1cf5d361961db95ca273 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Wed, 17 Mar 2021 19:56:04 +0100
Subject: [PATCH 107/145] pods release v0.0.1 [skip ci]

---
 pods | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pods b/pods
index 0bffce35..490073f9 160000
--- a/pods
+++ b/pods
@@ -1 +1 @@
-Subproject commit 0bffce3573d0361cf2592d65cefc8a4048454ff9
+Subproject commit 490073f93a9bb3c61387f1af3f1f8ae27d7772a6

From 19b8e429bca25b813de91206fb4834751fd91606 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Thu, 18 Mar 2021 21:07:06 +0100
Subject: [PATCH 108/145] sci#553: new kw-arg handling from clojure 1.11.0

---
 sci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci b/sci
index ac4c05ee..b6ab05d5 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit ac4c05eef8fa4245297002b81bc6dba45b30712a
+Subproject commit b6ab05d5e4b0d6df594a6e03a5849caf82caecb3

From a8883bd5f2bf6b96fc27029b5f6650ae3fc0709a Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Thu, 18 Mar 2021 21:27:45 +0100
Subject: [PATCH 109/145] clojure [skip ci]

---
 deps.edn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps.edn b/deps.edn
index e4f4b7ef..797ec822 100644
--- a/deps.edn
+++ b/deps.edn
@@ -12,7 +12,7 @@
          "depstar/src" "process/src"
          "deps.clj/src" "deps.clj/resources"
          "resources" "sci/resources"],
- :deps {org.clojure/clojure {:mvn/version "1.10.2"},
+ :deps {org.clojure/clojure {:mvn/version "1.10.3"},
         borkdude/sci {:local/root "sci"}
         babashka/babasha.curl {:local/root "babashka.curl"}
         babashka/fs {:local/root "fs"}

From 716d5ff94c536c807315c2b84bdd9f3dd1500c85 Mon Sep 17 00:00:00 2001
From: Grazfather <grazfather@gmail.com>
Date: Sat, 20 Mar 2021 11:24:56 -0400
Subject: [PATCH 110/145] install: Use $download_url (#759)

We were only using this var in the echo, but it always said .zip, even
if we were using .tar.gz
---
 install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install b/install
index ca225b67..89bd1a5e 100755
--- a/install
+++ b/install
@@ -81,14 +81,14 @@ else
   util="$(which tar) -zxf"
 fi
 
-download_url="https://github.com/babashka/babashka/releases/download/v$version/babashka-$version-$platform-$arch.zip"
+download_url="https://github.com/babashka/babashka/releases/download/v$version/babashka-$version-$platform-$arch."$ext
 
 mkdir -p "$download_dir"
 cd "$download_dir"
 echo -e "Downloading $download_url to $download_dir"
 rm -rf "babashka-$version-$platform-$arch."$ext
 rm -rf "bb"
-curl -o "babashka-$version-$platform-$arch."$ext -sL "https://github.com/babashka/babashka/releases/download/v$version/babashka-$version-$platform-$arch."$ext
+curl -o "babashka-$version-$platform-$arch."$ext -sL $download_url
 $util "babashka-$version-$platform-$arch."$ext
 rm "babashka-$version-$platform-$arch."$ext
 

From ca056984ba85b4f0691306d64f1e34f027a87372 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 21 Mar 2021 10:53:04 +0100
Subject: [PATCH 111/145] [skip ci]

---
 pods | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pods b/pods
index 490073f9..82aa3627 160000
--- a/pods
+++ b/pods
@@ -1 +1 @@
-Subproject commit 490073f93a9bb3c61387f1af3f1f8ae27d7772a6
+Subproject commit 82aa3627106181a0ad58c289cd45129603e4fa24

From ee3aae6316bbddbbd9e132e2efd1b384fc14122c Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 22 Mar 2021 17:27:06 +0100
Subject: [PATCH 112/145] sci readme [skip ci]

---
 sci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci b/sci
index b6ab05d5..8c2f2bc2 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit b6ab05d5e4b0d6df594a6e03a5849caf82caecb3
+Subproject commit 8c2f2bc275370fe5150b1da5cbfb973baade03f7

From 8936060d42daeb3dda5c99446b41f21ed333e5e5 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 22 Mar 2021 20:32:47 +0100
Subject: [PATCH 113/145] Upgrade deps.clj and fs

---
 deps.clj | 2 +-
 fs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deps.clj b/deps.clj
index 0b708449..a301f478 160000
--- a/deps.clj
+++ b/deps.clj
@@ -1 +1 @@
-Subproject commit 0b70844983bf23fff4c2991dadb3fd14c4102b27
+Subproject commit a301f478f42452c829d92260a14fff8e8fcfea1a
diff --git a/fs b/fs
index d0394a19..19c03977 160000
--- a/fs
+++ b/fs
@@ -1 +1 @@
-Subproject commit d0394a1970d5d629204741d8d66107b54cc9c666
+Subproject commit 19c03977282bd63a3ecfd3e6a261a433aa9e8745

From 1533a2d0b57e3144c58c52dbf81114f607d2e530 Mon Sep 17 00:00:00 2001
From: Joey Bloom <15joeybloom@users.noreply.github.com>
Date: Fri, 26 Mar 2021 16:07:52 -0500
Subject: [PATCH 114/145] Fix cookie-parsing bug in the example note-taking app
 (#761)

---
 examples/notes.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/notes.clj b/examples/notes.clj
index 02e15588..1d005597 100755
--- a/examples/notes.clj
+++ b/examples/notes.clj
@@ -88,7 +88,7 @@
 
 (defn get-session-id [headers]
   (if-let [cookie-header (first (filter #(str/starts-with? % "Cookie: ") headers))]
-    (let [parts (str/split cookie-header #"; ")]
+    (let [parts (str/split (str/replace cookie-header "Cookie: " "") #"; ")]
       (if-let [notes-id (first (filter #(str/starts-with? % "notes-id") parts))]
         (str/replace notes-id "notes-id=" "")
         (new-session!)))

From 74ba198201fd273d9b3cc195f803267d75b7b40b Mon Sep 17 00:00:00 2001
From: Joey Bloom <15joeybloom@users.noreply.github.com>
Date: Fri, 26 Mar 2021 17:25:47 -0500
Subject: [PATCH 115/145] Update example notes app to use org.httpkit.server
 (#762) [skip ci]

---
 examples/notes.clj | 159 +++++++++++++++++----------------------------
 1 file changed, 61 insertions(+), 98 deletions(-)

diff --git a/examples/notes.clj b/examples/notes.clj
index 1d005597..c108e2b0 100755
--- a/examples/notes.clj
+++ b/examples/notes.clj
@@ -1,13 +1,9 @@
 #!/usr/bin/env bb
 
-;; Note that babashka comes with org.httpkit.server now, so you don't need to
-;; build an http server from scratch anymore like we do here. We should update
-;; this script to the built-in webserver. Whoever reads this is welcome to
-;; submit a PR.
-
-(import (java.net ServerSocket))
 (require '[clojure.java.io :as io]
-         '[clojure.string :as str])
+         '[clojure.pprint :refer [pprint]]
+         '[clojure.string :as str]
+         '[org.httpkit.server :as server])
 
 (def debug? true)
 (def user "admin")
@@ -40,43 +36,23 @@
         (str/join " " (map html v))
         :else (str v)))
 
-(defn write-response [out session-id status headers content]
-  (let [cookie-header (str "Set-Cookie: notes-id=" session-id)
-        headers (str/join "\r\n" (conj headers cookie-header))
-        response (str "HTTP/1.1 " status "\r\n"
-                      (str headers "\r\n")
-                      "Content-Length: " (if content (count content)
-                                             0)
-                      "\r\n\r\n"
-                      (when content
-                        (str content)))]
-    (when debug? (println response))
-    (binding [*out* out]
-      (print response)
-      (flush))))
-
 ;; the home page
-(defn home-response [out session-id]
-  (let [body (str
-              "<!DOCTYPE html>\n"
-              (html
-               [:html
-                [:head
-                 [:title "Notes"]]
-                [:body
-                 [:h1 "Notes"]
-                 [:pre (when (.exists notes-file)
-                         (slurp notes-file))]
-                 [:form {:action "/" :method "post"}
-                  [:input {:type "text" :name "note"}]
-                  [:input {:type "submit" :value "Submit"}]]]]))]
-    (write-response out session-id "200 OK" nil body)))
-
-(defn basic-auth-response [out session-id]
-  (write-response out session-id
-                  "401 Unauthorized"
-                  ["WWW-Authenticate: Basic realm=\"notes\""]
-                  nil))
+(defn home-response [session-id]
+  {:status 200
+   :headers {"Set-Cookie" (str "notes-id=" session-id)}
+   :body (str
+          "<!DOCTYPE html>\n"
+          (html
+           [:html
+            [:head
+             [:title "Notes"]]
+            [:body
+             [:h1 "Notes"]
+             [:pre (when (.exists notes-file)
+                     (slurp notes-file))]
+             [:form {:action "/" :method "post"}
+              [:input {:type "text" :name "note"}]
+              [:input {:type "submit" :value "Submit"}]]]]))})
 
 (def known-sessions
   (atom #{}))
@@ -86,67 +62,54 @@
     (swap! known-sessions conj uuid)
     uuid))
 
-(defn get-session-id [headers]
-  (if-let [cookie-header (first (filter #(str/starts-with? % "Cookie: ") headers))]
-    (let [parts (str/split (str/replace cookie-header "Cookie: " "") #"; ")]
-      (if-let [notes-id (first (filter #(str/starts-with? % "notes-id") parts))]
-        (str/replace notes-id "notes-id=" "")
-        (new-session!)))
-    (new-session!)))
-
-(defn basic-auth-header [headers]
-  (some #(str/starts-with? % "Basic-Auth: ") headers))
-
 (def authenticated-sessions
   (atom #{}))
 
 (defn authenticate! [session-id headers]
   (or (contains? @authenticated-sessions session-id)
-      (when (some #(= % (str "Authorization: Basic " base64)) headers)
+      (when (= (headers "authorization") (str "Basic " base64))
         (swap! authenticated-sessions conj session-id)
         true)))
 
+(defn parse-session-id [cookie]
+  (when cookie
+    (when-let [notes-id (first (filter #(str/starts-with? % "notes-id")
+                                       (str/split cookie #"; ")))]
+      (str/replace notes-id "notes-id=" ""))))
+
+(defn basic-auth-response [session-id]
+  {:status 401
+   :headers {"WWW-Authenticate" "Basic realm=\"notes\""
+             "Set-Cookie" (str "notes-id=" session-id)}})
+
 ;; run the server
-(with-open [server-socket (let [s (new ServerSocket 8080)]
-                            (println "Server started on port 8080.")
-                            s)]
-  (loop []
-    (let [client-socket (.accept server-socket)]
-      (future
-        (with-open [conn client-socket]
-          (try
-            (let [out (io/writer (.getOutputStream conn))
-                  is (.getInputStream conn)
-                  in (io/reader is)
-                  [_req & headers :as response]
-                  (loop [headers []]
-                    (let [line (.readLine in)]
-                      (if (str/blank? line)
-                        headers
-                        (recur (conj headers line)))))
-                  session-id (get-session-id headers)
-                  form-data (let [sb (StringBuilder.)]
-                              (loop []
-                                (when (.ready in)
-                                  (.append sb (char (.read in)))
-                                  (recur)))
-                              (-> (str sb)
-                                  (java.net.URLDecoder/decode)))
-                  _ (when debug? (println (str/join "\n" response)))
-                  _ (when-not (str/blank? form-data)
-                      (when debug? (println form-data))
-                      (let [note (str/replace form-data "note=" "")]
-                        (write-note! note)))
-                  _ (when debug? (println))]
-              (cond
-                ;; if we didn't see this session before, we want the user to re-authenticate
-                (not (contains? @known-sessions session-id))
-                (let [uuid (new-session!)]
-                  (basic-auth-response out uuid))
-                (not (authenticate! session-id headers))
-                (basic-auth-response out session-id)
-                :else (home-response out session-id)))
-            (catch Throwable t
-              (binding [*err* *out*]
-                (println t)))))))
-    (recur)))
+(defn handler [req]
+  (when debug?
+    (println "Request:")
+    (pprint req))
+  (let [body (some-> req :body slurp java.net.URLDecoder/decode)
+        session-id (parse-session-id (get-in req [:headers "cookie"]))
+        _ (when (and debug? body)
+            (println "Request body:" body))
+        response (cond
+                   ;; if we didn't see this session before, we want the user to
+                   ;; re-authenticate
+                   (not (contains? @known-sessions session-id))
+                   (basic-auth-response (new-session!))
+
+                   (not (authenticate! session-id (:headers req)))
+                   (basic-auth-response session-id)
+
+                   :else (do (when-not (str/blank? body)
+                               (let [note (str/replace body "note=" "")]
+                                 (write-note! note)))
+                             (home-response session-id)))]
+    (when debug?
+      (println "Response:")
+      (pprint (dissoc response :body))
+      (println))
+    response))
+
+(server/run-server handler {:port 8080})
+(println "Server started on port 8080.")
+@(promise) ;; wait until SIGINT

From a026e1eebaa98bb097f60e47f3c504ae4d06a42c Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 27 Mar 2021 11:33:34 +0100
Subject: [PATCH 116/145] process: #39

---
 process | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/process b/process
index f5b531f7..498a82bd 160000
--- a/process
+++ b/process
@@ -1 +1 @@
-Subproject commit f5b531f706fd2b3cfba93c15411d3308e25b5917
+Subproject commit 498a82bd90be0e997b296007f35ac8b0f8a39e43

From bfe139eacc145122c7d0ad1d866a80eed8c5651d Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 27 Mar 2021 11:52:33 +0100
Subject: [PATCH 117/145] add vars

---
 src/babashka/impl/process.clj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/babashka/impl/process.clj b/src/babashka/impl/process.clj
index c31b172a..28aef471 100644
--- a/src/babashka/impl/process.clj
+++ b/src/babashka/impl/process.clj
@@ -22,6 +22,8 @@
    'start       (copy-var process/start tns)
    'pipeline    (copy-var process/pipeline tns)
    '$           (copy-var process/$ tns)
+   'sh          (copy-var process/sh tns)
+   'tokenize    (copy-var process/tokenize tns)
    '*defaults*  defaults
    'destroy     (copy-var process/destroy tns)
    'destroy-tree (copy-var process/destroy-tree tns)})

From 0ce64d83fb05c2e56195060fe14cab5e7ab4d845 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 27 Mar 2021 12:15:40 +0100
Subject: [PATCH 118/145] process: #40

---
 process | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/process b/process
index 498a82bd..199a8fe9 160000
--- a/process
+++ b/process
@@ -1 +1 @@
-Subproject commit 498a82bd90be0e997b296007f35ac8b0f8a39e43
+Subproject commit 199a8fe993331f9958c6c3e170a8a837af2170a2

From 2c871dfd1ddd17d13009cfb60284b9b3206ebd32 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 27 Mar 2021 12:21:47 +0100
Subject: [PATCH 119/145] process [changelog] [skip ci]

---
 process | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/process b/process
index 199a8fe9..692195db 160000
--- a/process
+++ b/process
@@ -1 +1 @@
-Subproject commit 199a8fe993331f9958c6c3e170a8a837af2170a2
+Subproject commit 692195db27fe411b65e24dbacec75c9f4721a486

From 2bc935d3d8b93f848319a212a4fb18e9374af349 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 27 Mar 2021 16:52:35 +0100
Subject: [PATCH 120/145] deps.clj

---
 deps.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps.clj b/deps.clj
index a301f478..ca0e98fc 160000
--- a/deps.clj
+++ b/deps.clj
@@ -1 +1 @@
-Subproject commit a301f478f42452c829d92260a14fff8e8fcfea1a
+Subproject commit ca0e98fcefb916c6c0e6fdac73800395b8923af8

From d71c3622ec2f4174a310095f2f8f2adf7316419f Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Mar 2021 17:30:44 +0200
Subject: [PATCH 121/145] bb.edn: first iteration

---
 project.clj                              |   3 +-
 src/babashka/impl/classpath.clj          |  31 +-
 src/babashka/impl/clojure/core.clj       |   6 +-
 src/babashka/impl/deps.clj               |  19 +-
 src/babashka/main.clj                    | 422 +++++++++++++----------
 test-resources/bb-edn/user.clj           |  10 +
 test-resources/task_scripts/tasks.clj    |  11 +
 test/babashka/bb_edn_test.clj            |  38 ++
 test/babashka/impl/nrepl_server_test.clj |   2 +-
 test/babashka/impl/socket_repl_test.clj  |   2 +-
 test/babashka/main_test.clj              |  13 +-
 test/babashka/test_utils.clj             |  52 ++-
 test/babashka/uberjar_test.clj           |   5 +-
 13 files changed, 382 insertions(+), 232 deletions(-)
 create mode 100644 test-resources/bb-edn/user.clj
 create mode 100644 test-resources/task_scripts/tasks.clj
 create mode 100644 test/babashka/bb_edn_test.clj

diff --git a/project.clj b/project.clj
index 0347a567..5f98126c 100644
--- a/project.clj
+++ b/project.clj
@@ -67,8 +67,7 @@
                     :feature/hiccup
                     :feature/test-check
                     :feature/spec-alpha
-                    {:dependencies [[clj-commons/conch "0.9.2"]
-                                    [com.clojure-goes-fast/clj-async-profiler "0.4.1"]
+                    {:dependencies [[com.clojure-goes-fast/clj-async-profiler "0.4.1"]
                                     [com.opentable.components/otj-pg-embedded "0.13.3"]]}]
              :uberjar {:global-vars {*assert* false}
                        :jvm-opts ["-Dclojure.compiler.direct-linking=true"
diff --git a/src/babashka/impl/classpath.clj b/src/babashka/impl/classpath.clj
index 14a0339c..8c4cb1fe 100644
--- a/src/babashka/impl/classpath.clj
+++ b/src/babashka/impl/classpath.clj
@@ -28,17 +28,18 @@
      resource-paths)))
 
 (defn path-from-jar
-  [^java.io.File jar-file resource-paths {:keys [:url?]}]
-  (with-open [jar (JarFile. jar-file)]
-    (some (fn [path]
-            (when-let [entry (.getEntry jar path)]
-              (if url?
-                ;; manual conversion, faster than going through .toURI
-                (java.net.URL. "jar" nil
-                 (str "file:" (.getAbsolutePath jar-file) "!/" path))
-                {:file path
-                 :source (slurp (.getInputStream jar entry))})))
-          resource-paths)))
+  [^java.io.File jar-file resource-paths opts]
+  (let [url? (:url? opts)]
+    (with-open [jar (JarFile. jar-file)]
+      (some (fn [path]
+              (when-let [entry (.getEntry jar path)]
+                (if url?
+                  ;; manual conversion, faster than going through .toURI
+                  (java.net.URL. "jar" nil
+                                 (str "file:" (.getAbsolutePath jar-file) "!/" path))
+                  {:file path
+                   :source (slurp (.getInputStream jar entry))})))
+            resource-paths))))
 
 (deftype JarFileResolver [jar-file]
   IResourceResolver
@@ -57,8 +58,10 @@
   (getResources [_ resource-paths opts]
     (keep #(getResource % resource-paths opts) entries)))
 
+(def path-sep (System/getProperty "path.separator"))
+
 (defn loader [^String classpath]
-  (let [parts (.split classpath (System/getProperty "path.separator"))
+  (let [parts (.split classpath path-sep)
         entries (map part->entry parts)]
     (Loader. entries)))
 
@@ -88,7 +91,7 @@
          (fn [{:keys [:cp]}]
            (let [new-cp
                  (if-not cp extra-classpath
-                         (str cp (System/getProperty "path.separator") extra-classpath))]
+                         (str cp path-sep extra-classpath))]
              {:loader (loader new-cp)
               :cp new-cp})))
   nil)
@@ -96,7 +99,7 @@
 (defn split-classpath
   "Returns the classpath as a seq of strings, split by the platform
   specific path separator."
-  ([^String cp] (vec (.split cp (System/getProperty "path.separator")))))
+  ([^String cp] (vec (.split cp path-sep))))
 
 (defn get-classpath
   "Returns the current classpath as set by --classpath, BABASHKA_CLASSPATH and add-classpath."
diff --git a/src/babashka/impl/clojure/core.clj b/src/babashka/impl/clojure/core.clj
index 0ef0c81b..a0f3e946 100644
--- a/src/babashka/impl/clojure/core.clj
+++ b/src/babashka/impl/clojure/core.clj
@@ -20,6 +20,8 @@
      ret#))
 
 (def data-readers (sci/new-dynamic-var '*data-readers* nil))
+(def command-line-args (sci/new-dynamic-var '*command-line-args* nil))
+(def warn-on-reflection (sci/new-dynamic-var '*warn-on-reflection* false))
 
 (defn read+string
   "Added for compatibility. Must be used with
@@ -59,4 +61,6 @@
    'default-data-readers default-data-readers
    'xml-seq (copy-core-var xml-seq)
    'read+string (fn [& args]
-                  (apply read+string @common/ctx args))})
+                  (apply read+string @common/ctx args))
+   '*command-line-args* command-line-args
+   '*warn-on-reflection* warn-on-reflection})
diff --git a/src/babashka/impl/deps.clj b/src/babashka/impl/deps.clj
index ad642f3e..08d6ff20 100644
--- a/src/babashka/impl/deps.clj
+++ b/src/babashka/impl/deps.clj
@@ -57,11 +57,20 @@
   then used to resolve dependencies in babashka."
   ([deps-map] (add-deps deps-map nil))
   ([deps-map {:keys [:aliases]}]
-   (let [args ["-Spath" "-Sdeps" (str deps-map)]
-         args (cond-> args
-                aliases (conj (str "-A:" (str/join ":" aliases))))
-         cp (with-out-str (apply deps/-main args))]
-     (cp/add-classpath cp))))
+   (when-let [paths (:paths deps-map)]
+     (cp/add-classpath (str/join cp/path-sep paths)))
+   (when-let [deps-map (not-empty (dissoc deps-map :paths :tasks))]
+     (let [deps-map (assoc-in deps-map [:aliases :org.babashka/defaults]
+                              '{:replace-paths [] ;; babashka sets paths manually
+                                :classpath-overrides {org.clojure/clojure ""
+                                                      org.clojure/spec.alpha ""
+                                                      org.clojure/core.specs.alpha ""}})
+           args ["-Spath" "-Sdeps" (str deps-map)]
+           args (conj args (str "-A:" (str/join ":" (cons ":org.babashka/defaults" aliases))))
+           cp (with-out-str (apply deps/-main args))
+           cp (str/trim cp)
+           cp (str/replace cp (re-pattern (str cp/path-sep "+$")) "")]
+       (cp/add-classpath cp)))))
 
 (defn clojure
   "Starts clojure similar to CLI. Use `rlwrap bb` for `clj`-like invocation.
diff --git a/src/babashka/main.clj b/src/babashka/main.clj
index 6aa8dc1f..17a055d0 100644
--- a/src/babashka/main.clj
+++ b/src/babashka/main.clj
@@ -2,6 +2,7 @@
   {:no-doc true}
   (:refer-clojure :exclude [error-handler])
   (:require
+   [babashka.fs :as fs]
    [babashka.impl.bencode :refer [bencode-namespace]]
    [babashka.impl.cheshire :refer [cheshire-core-namespace]]
    [babashka.impl.classes :as classes]
@@ -74,185 +75,100 @@
 ;; echo '1' | java -agentlib:native-image-agent=config-output-dir=/tmp -jar target/babashka-xxx-standalone.jar '...'
 ;; with the java provided by GraalVM.
 
-(defn parse-opts [options]
-  (let [opts (loop [options options
-                    opts-map {}]
-               (if options
-                 (let [opt (first options)]
-                   (case opt
-                     ("--") (assoc opts-map :command-line-args (next options))
-                     ("--clojure") (assoc opts-map :clojure true
-                                          :opts (rest options))
-                     ("--version") {:version true}
-                     ("--help" "-h" "-?") {:help? true}
-                     ("--verbose")(recur (next options)
-                                         (assoc opts-map
-                                                :verbose? true))
-                     ("--describe") (recur (next options)
-                                           (assoc opts-map
-                                                  :describe? true))
-                     ("--stream") (recur (next options)
-                                         (assoc opts-map
-                                                :stream? true))
-                     ("-i") (recur (next options)
-                                   (assoc opts-map
-                                          :shell-in true))
-                     ("-I") (recur (next options)
-                                   (assoc opts-map
-                                          :edn-in true))
-                     ("-o") (recur (next options)
-                                   (assoc opts-map
-                                          :shell-out true))
-                     ("-O") (recur (next options)
-                                   (assoc opts-map
-                                          :edn-out true))
-                     ("-io") (recur (next options)
-                                    (assoc opts-map
-                                           :shell-in true
-                                           :shell-out true))
-                     ("-iO") (recur (next options)
-                                    (assoc opts-map
-                                           :shell-in true
-                                           :edn-out true))
-                     ("-Io") (recur (next options)
-                                    (assoc opts-map
-                                           :edn-in true
-                                           :shell-out true))
-                     ("-IO") (recur (next options)
-                                    (assoc opts-map
-                                           :edn-in true
-                                           :edn-out true))
-                     ("--classpath", "-cp")
-                     (let [options (next options)]
-                       (recur (next options)
-                              (assoc opts-map :classpath (first options))))
-                     ("--uberscript")
-                     (let [options (next options)]
-                       (recur (next options)
-                              (assoc opts-map
-                                     :uberscript (first options))))
-                     ("--uberjar")
-                     (let [options (next options)]
-                       (recur (next options)
-                              (assoc opts-map
-                                     :uberjar (first options))))
-                     ("-f" "--file")
-                     (let [options (next options)]
-                       (recur (next options)
-                              (assoc opts-map
-                                     :file (first options))))
-                     ("--jar" "-jar")
-                     (let [options (next options)]
-                       (recur (next options)
-                              (assoc opts-map
-                                     :jar (first options))))
-                     ("--repl")
-                     (let [options (next options)]
-                       (recur (next options)
-                              (assoc opts-map
-                                     :repl true)))
-                     ("--socket-repl")
-                     (let [options (next options)
-                           opt (first options)
-                           opt (when (and opt (not (str/starts-with? opt "-")))
-                                 opt)
-                           options (if opt (next options)
-                                       options)]
-                       (recur options
-                              (assoc opts-map
-                                     :socket-repl (or opt "1666"))))
-                     ("--nrepl-server")
-                     (let [options (next options)
-                           opt (first options)
-                           opt (when (and opt (not (str/starts-with? opt "-")))
-                                 opt)
-                           options (if opt (next options)
-                                       options)]
-                       (recur options
-                              (assoc opts-map
-                                     :nrepl (or opt "1667"))))
-                     ("--eval", "-e")
-                     (let [options (next options)]
-                       (recur (next options)
-                              (update opts-map :expressions (fnil conj []) (first options))))
-                     ("--main", "-m")
-                     (let [options (next options)]
-                       (recur (next options)
-                              (assoc opts-map :main (first options))))
-                     (if (some opts-map [:file :jar :socket-repl :expressions :main])
-                       (assoc opts-map
-                              :command-line-args options)
-                       (let [trimmed-opt (str/triml opt)
-                             c (.charAt trimmed-opt 0)]
-                         (case c
-                           (\( \{ \[ \* \@ \#)
-                           (-> opts-map
-                               (update :expressions (fnil conj []) (first options))
-                               (assoc :command-line-args (next options)))
-                           (assoc opts-map
-                                  (if (str/ends-with? opt ".jar")
-                                    :jar :file) opt
-                                  :command-line-args (next options)))))))
-                 opts-map))]
-    opts))
-
 (def version (str/trim (slurp (io/resource "BABASHKA_VERSION"))))
 
 (defn print-version []
   (println (str "babashka v" version)))
 
+(def bb-edn
+  (volatile! nil))
 
-(defn print-help []
+(defn command? [x]
+  (case x
+    ("clojure"
+     "version"
+     "help"
+     "doc"
+     "tasks"
+     "uberjar"
+     "uberscript"
+     "repl"
+     "socket-repl"
+     "nrepl-server"
+     "describe") true
+    false))
+
+(defn print-error [& msgs]
+  (binding [*out* *err*]
+    (apply println msgs)))
+
+(defn print-help [_ctx _command-line-args]
   (println (str "Babashka v" version))
   ;; (println (str "sci v" (str/trim (slurp (io/resource "SCI_VERSION")))))
   (println)
-  (println "Options must appear in the order of groups mentioned below.")
   (println "
 Help:
 
-  --help, -h or -?    Print this help text.
-  --version           Print the current version of babashka.
-  --describe          Print an EDN map with information about this version of babashka.
-
-Evaluation:
-
-  -e, --eval <expr>   Evaluate an expression.
-  -f, --file <path>   Evaluate a file.
-  -cp, --classpath    Classpath to use.
-  -m, --main <ns>     Call the -main function from namespace with args.
-  --verbose           Print debug information and entire stacktrace in case of exception.
+  help, -h or -?     Print this help text.
+  version            Print the current version of babashka.
+  describe           Print an EDN map with information about this version of babashka.
+  doc <var|ns>       Print docstring of var or namespace. Requires namespace if necessary.
 
 REPL:
 
-  --repl              Start REPL. Use rlwrap for history.
-  --socket-repl       Start socket REPL. Specify port (e.g. 1666) or host and port separated by colon (e.g. 127.0.0.1:1666).
-  --nrepl-server      Start nREPL server. Specify port (e.g. 1667) or host and port separated by colon (e.g. 127.0.0.1:1667).
+  Usage: <repl-command> [port/host] [eval-opts]
+  Specify port (e.g. 1666) or host and port separated by colon (e.g. 127.0.0.1:1666).
 
-In- and output flags:
-
-  -i                  Bind *input* to a lazy seq of lines from stdin.
-  -I                  Bind *input* to a lazy seq of EDN values from stdin.
-  -o                  Write lines to stdout.
-  -O                  Write EDN values to stdout.
-  --stream            Stream over lines or EDN values from stdin. Combined with -i or -I *input* becomes a single value per iteration.
-
-Uberscript:
-
-  --uberscript <file> Collect preloads, -e, -f and -m and all required namespaces from the classpath into a single file.
-
-Uberjar:
-
-  --uberjar    <jar>  Similar to --uberscript but creates jar file.
+  repl               Start REPL. Use rlwrap for history. When invoking bb with no args, this is the default command.
+  socket-repl        Start socket REPL.
+  nrepl-server       Start nREPL server.
 
 Clojure:
 
-  --clojure [args...] Invokes clojure. Takes same args as the official clojure CLI.
+  clojure [args...]  Invokes clojure. Takes same args as the official clojure CLI.
+
+Packaging:
+
+  uberscript <file> [eval-opts]  Collect preloads, -e, -f and -m and all required namespaces from the classpath into a single file.
+
+  uberjar    <jar> [eval-opts]   Similar to --uberscript but creates jar file.
+
+Evaluation:
+
+  -e, --eval <expr>    Evaluate an expression.
+  -f, --file <path>    Evaluate a file.
+  -cp, --classpath     Classpath to use.
+  -m, --main <ns|var>  Call the -main function from a namespace or call a fully qualified var.
+  --verbose            Print debug information and entire stacktrace in case of exception.
+
+In- and output flags:
+
+  -i                 Bind *input* to a lazy seq of lines from stdin.
+  -I                 Bind *input* to a lazy seq of EDN values from stdin.
+  -o                 Write lines to stdout.
+  -O                 Write EDN values to stdout.
+  --stream           Stream over lines or EDN values from stdin. Combined with -i or -I *input* becomes a single value per iteration.
 
 If the first argument is not any of the above options, then it treated as a file if it exists, or as an expression otherwise.
 Everything after that is bound to *command-line-args*.
 
 Use -- to separate script command line args from bb command line args.
-"))
+")
+  [nil 0])
+
+(defn print-doc [ctx command-line-args]
+  (let [arg (first command-line-args)]
+    (if (sci/eval-string* ctx (format "
+(when (or (resolve '%1$s)
+          (if (simple-symbol? '%1$s)
+            (try (require '%1$s) true
+              (catch Exception e nil))
+            (requiring-resolve '%1$s)))
+ (clojure.repl/doc %1$s)
+ true)" arg))
+      [nil 0]
+      [(print-error "No docstring found for var:" arg) 1]))
+  ,)
 
 (defn print-describe []
   (println
@@ -301,8 +217,6 @@ Use -- to separate script command line args from bb command line args.
         (str/replace x #"^#!.*" ""))
       (throw (Exception. (str "File does not exist: " file))))))
 
-(def reflection-var (sci/new-dynamic-var '*warn-on-reflection* false))
-
 (defn load-file* [f]
   (let [f (io/file f)
         s (slurp f)]
@@ -319,7 +233,7 @@ Use -- to separate script command line args from bb command line args.
         nrepl-opts (assoc nrepl-opts
                           :debug dev?
                           :describe {"versions" {"babashka" version}}
-                          :thread-bind [reflection-var])]
+                          :thread-bind [core/warn-on-reflection])]
     (nrepl-server/start-server! ctx nrepl-opts)
     (binding [*out* *err*]
       (println "For more info visit: https://book.babashka.org/#_nrepl")))
@@ -477,27 +391,156 @@ Use -- to separate script command line args from bb command line args.
 (defn shell-seq [in]
   (line-seq (java.io.BufferedReader. in)))
 
-(defn main
-  [& args]
-  (handle-pipe!)
-  (handle-sigint!)
+(defn parse-opts [options]
+  (let [opt (first options)]
+    (cond (and (command? opt)
+               (not (fs/regular-file? opt)))
+          (recur (cons (str "--" opt) (next options)))
+          :else
+          (let [opts (loop [options options
+                            opts-map {}]
+                       (if options
+                         (let [opt (first options)]
+                           (case opt
+                             ("--") (assoc opts-map :command-line-args (next options))
+                             ("--clojure") (assoc opts-map :clojure true
+                                                  :command-line-args (rest options))
+                             ("--version") {:version true}
+                             ("--help" "-h" "-?" "help")
+                             {:help true
+                              :command-line-args (rest options)}
+                             ("--doc")
+                             {:doc true
+                              :command-line-args (rest options)}
+                             ("--verbose") (recur (next options)
+                                                  (assoc opts-map
+                                                         :verbose? true))
+                             ("--describe") (recur (next options)
+                                                   (assoc opts-map
+                                                          :describe? true))
+                             ("--stream") (recur (next options)
+                                                 (assoc opts-map
+                                                        :stream? true))
+                             ("-i") (recur (next options)
+                                           (assoc opts-map
+                                                  :shell-in true))
+                             ("-I") (recur (next options)
+                                           (assoc opts-map
+                                                  :edn-in true))
+                             ("-o") (recur (next options)
+                                           (assoc opts-map
+                                                  :shell-out true))
+                             ("-O") (recur (next options)
+                                           (assoc opts-map
+                                                  :edn-out true))
+                             ("-io") (recur (next options)
+                                            (assoc opts-map
+                                                   :shell-in true
+                                                   :shell-out true))
+                             ("-iO") (recur (next options)
+                                            (assoc opts-map
+                                                   :shell-in true
+                                                   :edn-out true))
+                             ("-Io") (recur (next options)
+                                            (assoc opts-map
+                                                   :edn-in true
+                                                   :shell-out true))
+                             ("-IO") (recur (next options)
+                                            (assoc opts-map
+                                                   :edn-in true
+                                                   :edn-out true))
+                             ("--classpath", "-cp")
+                             (let [options (next options)]
+                               (recur (next options)
+                                      (assoc opts-map :classpath (first options))))
+                             ("--uberscript")
+                             (let [options (next options)]
+                               (recur (next options)
+                                      (assoc opts-map
+                                             :uberscript (first options))))
+                             ("--uberjar")
+                             (let [options (next options)]
+                               (recur (next options)
+                                      (assoc opts-map
+                                             :uberjar (first options))))
+                             ("-f" "--file")
+                             (let [options (next options)]
+                               (recur (next options)
+                                      (assoc opts-map
+                                             :file (first options))))
+                             ("--jar" "-jar")
+                             (let [options (next options)]
+                               (recur (next options)
+                                      (assoc opts-map
+                                             :jar (first options))))
+                             ("--repl")
+                             (let [options (next options)]
+                               (recur (next options)
+                                      (assoc opts-map
+                                             :repl true)))
+                             ("--socket-repl")
+                             (let [options (next options)
+                                   opt (first options)
+                                   opt (when (and opt (not (str/starts-with? opt "-")))
+                                         opt)
+                                   options (if opt (next options)
+                                               options)]
+                               (recur options
+                                      (assoc opts-map
+                                             :socket-repl (or opt "1666"))))
+                             ("--nrepl-server")
+                             (let [options (next options)
+                                   opt (first options)
+                                   opt (when (and opt (not (str/starts-with? opt "-")))
+                                         opt)
+                                   options (if opt (next options)
+                                               options)]
+                               (recur options
+                                      (assoc opts-map
+                                             :nrepl (or opt "1667"))))
+                             ("--eval", "-e")
+                             (let [options (next options)]
+                               (recur (next options)
+                                      (update opts-map :expressions (fnil conj []) (first options))))
+                             ("--main", "-m",)
+                             (let [options (next options)]
+                               (recur (next options)
+                                      (assoc opts-map :main (first options))))
+                             ;; fallback
+                             (if (some opts-map [:file :jar :socket-repl :expressions :main])
+                               (assoc opts-map
+                                      :command-line-args options)
+                               (let [trimmed-opt (str/triml opt)
+                                     c (.charAt trimmed-opt 0)]
+                                 (case c
+                                   (\( \{ \[ \* \@ \#)
+                                   (-> opts-map
+                                       (update :expressions (fnil conj []) (first options))
+                                       (assoc :command-line-args (next options)))
+                                   (assoc opts-map
+                                          (if (str/ends-with? opt ".jar")
+                                            :jar :file) opt
+                                          :command-line-args (next options)))))))
+                         opts-map))]
+            opts))))
+
+(def env (atom {}))
+
+(defn exec [opts]
   (binding [*unrestricted* true]
-    (sci/binding [reflection-var false
+    (sci/binding [core/warn-on-reflection @core/warn-on-reflection
                   core/data-readers @core/data-readers
                   sci/ns @sci/ns]
       (let [{version-opt :version
              :keys [:shell-in :edn-in :shell-out :edn-out
-                    :help? :file :command-line-args
+                    :help :file :command-line-args
                     :expressions :stream?
                     :repl :socket-repl :nrepl
                     :verbose? :classpath
                     :main :uberscript :describe?
-                    :jar :uberjar :clojure] :as opts}
-            (parse-opts args)
-            _ (when clojure
-                (if-let [proc (deps/clojure (:opts opts))]
-                  (-> @proc :exit (System/exit))
-                  (System/exit 0)))
+                    :jar :uberjar :clojure
+                    :doc]}
+            opts
             _ (when verbose? (vreset! common/verbose? true))
             _ (do ;; set properties
                 (when main (System/setProperty "babashka.main" main))
@@ -516,7 +559,6 @@ Use -- to separate script command line args from bb command line args.
                                          :else
                                          (edn/read {:readers edn-readers} *in*))))))
             uberscript-sources (atom ())
-            env (atom {})
             classpath (or classpath
                           (System/getenv "BABASHKA_CLASSPATH"))
             _ (when classpath
@@ -546,15 +588,11 @@ Use -- to separate script command line args from bb command line args.
                                    ["META-INF/MANIFEST.MF"] {:url? true})]
                      (cp/main-ns res))
                    main)
-
             ;; TODO: pull more of these values to compile time
             opts {:aliases aliases
                   :namespaces (-> namespaces
                                   (assoc 'clojure.core
                                          (assoc core-extras
-                                                '*command-line-args*
-                                                (sci/new-dynamic-var '*command-line-args* command-line-args)
-                                                '*warn-on-reflection* reflection-var
                                                 'load-file load-file*))
                                   (assoc-in ['clojure.java.io 'resource]
                                             (fn [path]
@@ -579,8 +617,15 @@ Use -- to separate script command line args from bb command line args.
             preloads (some-> (System/getenv "BABASHKA_PRELOADS") (str/trim))
             [expressions exit-code]
             (cond expressions [expressions nil]
-                  main [[(format "(ns user (:require [%1$s])) (apply %1$s/-main *command-line-args*)"
-                                 main)] nil]
+                  main
+                  (let [sym (symbol main)
+                        ns? (namespace sym)
+                        ns (or ns? sym)
+                        var-name (if ns?
+                                   (name sym)
+                                   "-main")]
+                    [[(format "(ns user (:require [%1$s])) (apply %1$s/%2$s *command-line-args*)"
+                              ns var-name)] nil])
                   file (try [[(read-file file)] nil]
                             (catch Exception e
                               (error-handler e {:expression expressions
@@ -610,8 +655,8 @@ Use -- to separate script command line args from bb command line args.
                 (second
                  (cond version-opt
                        [(print-version) 0]
-                       help?
-                       [(print-help) 0]
+                       help (print-help sci-ctx command-line-args)
+                       doc (print-doc sci-ctx command-line-args)
                        describe?
                        [(print-describe) 0]
                        repl [(repl/start-repl! sci-ctx) 0]
@@ -626,7 +671,8 @@ Use -- to separate script command line args from bb command line args.
                                  [nil 0] ;; done streaming
                                  (let [res [(let [res
                                                   (sci/binding [sci/file (or @sci/file "<expr>")
-                                                                input-var in]
+                                                                input-var in
+                                                                core/command-line-args command-line-args]
                                                     (sci/eval-string* sci-ctx expression))]
                                               (when (some? res)
                                                 (if-let [pr-f (cond shell-out println
@@ -645,6 +691,9 @@ Use -- to separate script command line args from bb command line args.
                                                :verbose? verbose?
                                                :preloads preloads
                                                :loader (:loader @cp/cp-state)}))))
+                       clojure [nil (if-let [proc (deps/clojure command-line-args)]
+                                      (-> @proc :exit)
+                                      0)]
                        uberscript [nil 0]
                        :else [(repl/start-repl! sci-ctx) 0]))
                 1)]
@@ -664,8 +713,21 @@ Use -- to separate script command line args from bb command line args.
                         :verbose verbose?}))
         exit-code))))
 
+(defn main [& args]
+  (let [bb-edn-file (or (System/getenv "BABASHKA_EDN")
+                        "bb.edn")]
+    (when (fs/exists? bb-edn-file)
+      (let [edn (edn/read-string (slurp bb-edn-file))]
+        (vreset! bb-edn edn)))
+    ;; we mutate the atom from tests as well, so despite the above it can contain a bb.edn
+    (when-let [bb-edn @bb-edn] (deps/add-deps bb-edn)))
+  (let [opts (parse-opts args)]
+    (exec opts)))
+
 (defn -main
   [& args]
+  (handle-pipe!)
+  (handle-sigint!)
   (if-let [dev-opts (System/getenv "BABASHKA_DEV")]
     (let [{:keys [:n]} (if (= "true" dev-opts) {:n 1}
                            (edn/read-string dev-opts))
diff --git a/test-resources/bb-edn/user.clj b/test-resources/bb-edn/user.clj
new file mode 100644
index 00000000..c8726eb6
--- /dev/null
+++ b/test-resources/bb-edn/user.clj
@@ -0,0 +1,10 @@
+(ns user
+  (:require [babashka.process :as p]
+            [clojure.string :as str]))
+
+(defn bash [& args]
+  ;; (prn :cmd  *command-line-args*)
+  (-> (p/process ["bash" "-c" (str/join " " args)]
+                 {:inherit true})
+      p/check)
+  nil)
diff --git a/test-resources/task_scripts/tasks.clj b/test-resources/task_scripts/tasks.clj
new file mode 100644
index 00000000..2fadb15d
--- /dev/null
+++ b/test-resources/task_scripts/tasks.clj
@@ -0,0 +1,11 @@
+(ns tasks
+  "This is task ns docstring.")
+
+(defn -main
+  "Main docstring"
+  [& args]
+  args)
+
+(defn foo
+  "Foo docstring"
+  [])
diff --git a/test/babashka/bb_edn_test.clj b/test/babashka/bb_edn_test.clj
new file mode 100644
index 00000000..f99d54b2
--- /dev/null
+++ b/test/babashka/bb_edn_test.clj
@@ -0,0 +1,38 @@
+(ns babashka.bb-edn-test
+  (:require
+   [babashka.fs :as fs]
+   [babashka.test-utils :as test-utils]
+   [clojure.edn :as edn]
+   [clojure.string :as str]
+   [clojure.test :as test :refer [deftest is]]))
+
+(defn bb [& args]
+  (edn/read-string
+   {:readers *data-readers*
+    :eof nil}
+   (apply test-utils/bb nil (map str args))))
+
+(defmacro with-config [cfg & body]
+  `(let [temp-dir# (fs/create-temp-dir)
+         bb-edn-file# (fs/file temp-dir# "bb.edn")]
+     (binding [*print-meta* true]
+       (spit bb-edn-file# ~cfg))
+     (binding [test-utils/*bb-edn-path* (str bb-edn-file#)]
+       ~@body)))
+
+(deftest doc-test
+  (with-config {:paths ["test-resources/task_scripts"]}
+    (is (str/includes? (apply test-utils/bb nil
+                              (map str ["doc" "tasks"]))
+                       "This is task ns docstring."))
+    (is (str/includes? (apply test-utils/bb nil
+                              (map str ["doc" "tasks/foo"]))
+                       "Foo docstring"))
+    (is (str/includes? (apply test-utils/bb nil
+                              (map str ["doc" "tasks/-main"]))
+                       "Main docstring"))))
+
+(deftest deps-test
+  (with-config '{:deps {medley/medley {:mvn/version "1.3.0"}}}
+    (is (= '{1 {:id 1}, 2 {:id 2}}
+           (bb "-e" "(require 'medley.core)" "-e" "(medley.core/index-by :id [{:id 1} {:id 2}])")))))
diff --git a/test/babashka/impl/nrepl_server_test.clj b/test/babashka/impl/nrepl_server_test.clj
index 9f18d0ca..08dddee0 100644
--- a/test/babashka/impl/nrepl_server_test.clj
+++ b/test/babashka/impl/nrepl_server_test.clj
@@ -195,7 +195,7 @@
                             :features #{:bb}})
                      nrepl-opts)]
           (reset! server-state server))
-        (let [pb (ProcessBuilder. ["./bb" "--nrepl-server" "0.0.0.0:1668"])
+        (let [pb (ProcessBuilder. ["./bb" "nrepl-server" "0.0.0.0:1668"])
               _ (.redirectError pb ProcessBuilder$Redirect/INHERIT)
               ;; _ (.redirectOutput pb ProcessBuilder$Redirect/INHERIT)
               ;; env (.environment pb)
diff --git a/test/babashka/impl/socket_repl_test.clj b/test/babashka/impl/socket_repl_test.clj
index 7df4e857..8c99f64a 100644
--- a/test/babashka/impl/socket_repl_test.clj
+++ b/test/babashka/impl/socket_repl_test.clj
@@ -51,7 +51,7 @@
           (vreset! common/ctx ctx)
           (start-repl! "0.0.0.0:1666" ctx))
         (do (vreset! server-process
-                     (p/process ["./bb" "--socket-repl" "localhost:1666"]))
+                     (p/process ["./bb" "socket-repl" "localhost:1666"]))
             (w/wait-for-port "localhost" 1666)))
       (Thread/sleep 50)
       (is (socket-command "(+ 1 2 3)" "user=> 6"))
diff --git a/test/babashka/main_test.clj b/test/babashka/main_test.clj
index d48dea65..cc6931a5 100644
--- a/test/babashka/main_test.clj
+++ b/test/babashka/main_test.clj
@@ -7,21 +7,10 @@
    [clojure.java.io :as io]
    [clojure.java.shell :refer [sh]]
    [clojure.string :as str]
-   [clojure.test :as test :refer [deftest is testing *report-counters*]]
+   [clojure.test :as test :refer [deftest is testing]]
    [flatland.ordered.map :refer [ordered-map]]
    [sci.core :as sci]))
 
-(defmethod clojure.test/report :begin-test-var [m]
-  (println "===" (-> m :var meta :name))
-  (println))
-
-(defmethod clojure.test/report :end-test-var [_m]
-  (let [{:keys [:fail :error]} @*report-counters*]
-    (when (and (= "true" (System/getenv "BABASHKA_FAIL_FAST"))
-               (or (pos? fail) (pos? error)))
-      (println "=== Failing fast")
-      (System/exit 1))))
-
 (defn bb [input & args]
   (edn/read-string
    {:readers *data-readers*
diff --git a/test/babashka/test_utils.clj b/test/babashka/test_utils.clj
index 547d8a3b..5c4fe66a 100644
--- a/test/babashka/test_utils.clj
+++ b/test/babashka/test_utils.clj
@@ -2,14 +2,33 @@
   (:require
    [babashka.impl.classpath :as cp]
    [babashka.main :as main]
-   [me.raynes.conch :refer [let-programs] :as sh]
+   [babashka.process :as p]
+   [clojure.edn :as edn]
+   [clojure.test :as test :refer [*report-counters*]]
    [sci.core :as sci]
    [sci.impl.vars :as vars]))
 
 (set! *warn-on-reflection* true)
 
+(def ^:dynamic *bb-edn-path* nil)
+
+(defmethod clojure.test/report :begin-test-var [m]
+  (println "===" (-> m :var meta :name))
+  (println))
+
+(defmethod clojure.test/report :end-test-var [_m]
+  (let [{:keys [:fail :error]} @*report-counters*]
+    (when (and (= "true" (System/getenv "BABASHKA_FAIL_FAST"))
+               (or (pos? fail) (pos? error)))
+      (println "=== Failing fast")
+      (System/exit 1))))
+
 (defn bb-jvm [input-or-opts & args]
   (reset! cp/cp-state nil)
+  (reset! main/env {})
+  (if-let [path *bb-edn-path*]
+    (vreset! main/bb-edn (edn/read-string (slurp path)))
+    (vreset! main/bb-edn nil))
   (let [os (java.io.StringWriter.)
         es (if-let [err (:err input-or-opts)]
              err (java.io.StringWriter.))
@@ -30,26 +49,33 @@
                       (if (string? input-or-opts)
                         (with-in-str input-or-opts (apply main/main args))
                         (apply main/main args)))]
+            ;; (prn :err (str es))
             (if (zero? res)
               (str os)
-              (throw (ex-info (str es)
-                              {:stdout (str os)
-                               :stderr (str es)})))))
+              (do
+                (println (str os))
+                (throw (ex-info (str es)
+                                  {:stdout (str os)
+                                   :stderr (str es)}))))))
       (finally
         (when (string? input-or-opts) (vars/bindRoot sci/in *in*))
         (vars/bindRoot sci/out *out*)
         (vars/bindRoot sci/err *err*)))))
 
 (defn bb-native [input & args]
-  (let-programs [bb "./bb"]
-    (try (if input
-           (apply bb (conj (vec args)
-                           {:in input}))
-           (apply bb args))
-         (catch Exception e
-           (let [d (ex-data e)
-                 err-msg (or (:stderr (ex-data e)) "")]
-             (throw (ex-info err-msg d)))))))
+  (let [res (p/process (into ["./bb"] args)
+                       (cond-> {:in input
+                               :out :string
+                               :err :string}
+                         *bb-edn-path*
+                         (assoc
+                          :env (assoc (into {} (System/getenv))
+                                      "BABASHKA_EDN" *bb-edn-path*))))
+        res (deref res)
+        exit (:exit res)
+        error? (pos? exit)]
+    (if error? (throw (ex-info (or (:err res) "") {}))
+        (:out res))))
 
 (def bb
   (case (System/getenv "BABASHKA_TEST_ENV")
diff --git a/test/babashka/uberjar_test.clj b/test/babashka/uberjar_test.clj
index cbdd070f..5bb89dac 100644
--- a/test/babashka/uberjar_test.clj
+++ b/test/babashka/uberjar_test.clj
@@ -1,7 +1,6 @@
 (ns babashka.uberjar-test
   (:require
    [babashka.test-utils :as tu]
-   [clojure.edn :as edn]
    [clojure.string :as str]
    [clojure.test :as t :refer [deftest is testing]]))
 
@@ -10,7 +9,7 @@
         path (.getPath tmp-file)]
     (.deleteOnExit tmp-file)
     (testing "uberjar"
-      (tu/bb nil "--classpath" "test-resources/babashka/uberjar/src" "-m" "my.main-main" "--uberjar" path)
+      (tu/bb nil "uberjar" path "--classpath" "test-resources/babashka/uberjar/src" "-m" "my.main-main")
       (is (= "(\"1\" \"2\" \"3\" \"4\")\n"
              (tu/bb nil "--jar" path "1" "2" "3" "4")))
       (is (= "(\"1\" \"2\" \"3\" \"4\")\n"
@@ -25,5 +24,5 @@
     (let [tmp-file (java.io.File/createTempFile "uber" ".jar")
           path (.getPath tmp-file)]
       (.deleteOnExit tmp-file)
-      (tu/bb nil  "--classpath" "test-resources/babashka/uberjar/src" "--uberjar" path)
+      (tu/bb nil "uberjar" path "--classpath" "test-resources/babashka/uberjar/src")
       (is (str/includes? (tu/bb "(+ 1 2 3)" path) "6")))))

From 40d34c27d74a1e82df29ff1f0ada0c312a6192bd Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Mar 2021 17:33:40 +0200
Subject: [PATCH 122/145] help [skip ci]

---
 src/babashka/main.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/babashka/main.clj b/src/babashka/main.clj
index 17a055d0..d614cd57 100644
--- a/src/babashka/main.clj
+++ b/src/babashka/main.clj
@@ -116,7 +116,7 @@ Help:
 
 REPL:
 
-  Usage: <repl-command> [port/host] [eval-opts]
+  Usage: <repl-command> [port/host] [classpath-opt]
   Specify port (e.g. 1666) or host and port separated by colon (e.g. 127.0.0.1:1666).
 
   repl               Start REPL. Use rlwrap for history. When invoking bb with no args, this is the default command.

From 722de8ec75fd1e676b97c3bc89db7b895359ad5a Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Mar 2021 17:38:22 +0200
Subject: [PATCH 123/145] [#680] bb.edn [skip ci]


From 642cea3e16f232df971168c7cc8527485628afd6 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Mar 2021 17:38:57 +0200
Subject: [PATCH 124/145] [#758] allow fully qualified symbol as --main opt
 [skip ci]


From f941b394f442a2e64190c678299393c071ae6491 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Mar 2021 20:52:48 +0200
Subject: [PATCH 125/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65e3b16d..5f79b979 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,32 @@
 
 For a list of breaking changes, check [here](#breaking-changes).
 
+## 0.3.1
+
+Babashka proper:
+
+- Support `bb.edn` project config with `:paths` and `:deps`
+- Main options are now supported to be called as `bb option` instead of `bb --option`
+- Support fully qualified symbol in `--main` option [#758](https://github.com/babashka/babashka/issues/758)
+
+Babashka.fs:
+
+- Create target dir automatically in `copy-tree`
+
+Babashka.process:
+
+- Support tokenizing single string [#39](https://github.com/babashka/process/issues/39)
+- Support `:extra-env` option [#40](https://github.com/babashka/process/issues/40)
+
+Deps.clj:
+
+- Catch up with Clojure CLI 1.10.3.814 [#40](https://github.com/borkdude/deps.clj/issues/40)
+
+
+Sci:
+
+- Support new kwargs handling from 1.11.0 [#553](https://github.com/borkdude/sci/issues/553)
+
 ## 0.3.0
 
 ### New

From 66c0c8515f85f522670a7c784c84116b8a0ca565 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Mar 2021 20:56:28 +0200
Subject: [PATCH 126/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 1 -
 sci          | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f79b979..cbec2a09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,7 +23,6 @@ Deps.clj:
 
 - Catch up with Clojure CLI 1.10.3.814 [#40](https://github.com/borkdude/deps.clj/issues/40)
 
-
 Sci:
 
 - Support new kwargs handling from 1.11.0 [#553](https://github.com/borkdude/sci/issues/553)
diff --git a/sci b/sci
index 8c2f2bc2..97e2a641 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit 8c2f2bc275370fe5150b1da5cbfb973baade03f7
+Subproject commit 97e2a641e7de6a59dfa529a504e48f10fdeccb5b

From 99f6cd6ed4c57337af1fb218471151b2ab5759b3 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Mar 2021 20:57:15 +0200
Subject: [PATCH 127/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbec2a09..1d934e88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ Babashka proper:
 - Support `bb.edn` project config with `:paths` and `:deps`
 - Main options are now supported to be called as `bb option` instead of `bb --option`
 - Support fully qualified symbol in `--main` option [#758](https://github.com/babashka/babashka/issues/758)
+- Support new `doc` option to retrieve a docstring from the command line
 
 Babashka.fs:
 

From c1670e8670b157a6d22e785dfbb1f8dd5a54d0d4 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Mar 2021 22:48:44 +0200
Subject: [PATCH 128/145] Improve doc

---
 src/babashka/main.clj | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/babashka/main.clj b/src/babashka/main.clj
index d614cd57..3a7a624d 100644
--- a/src/babashka/main.clj
+++ b/src/babashka/main.clj
@@ -163,11 +163,12 @@ Use -- to separate script command line args from bb command line args.
           (if (simple-symbol? '%1$s)
             (try (require '%1$s) true
               (catch Exception e nil))
-            (requiring-resolve '%1$s)))
+            (try (requiring-resolve '%1$s) true
+              (catch Exception e nil))))
  (clojure.repl/doc %1$s)
  true)" arg))
       [nil 0]
-      [(print-error "No docstring found for var:" arg) 1]))
+      [nil 1]))
   ,)
 
 (defn print-describe []

From 88c621c1ec60581c3d5f83dd7fe5c306306a4156 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Mar 2021 23:12:04 +0200
Subject: [PATCH 129/145] sci: allow dynamic doc

---
 CHANGELOG.md | 1 +
 sci          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d934e88..d057a676 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ Deps.clj:
 Sci:
 
 - Support new kwargs handling from 1.11.0 [#553](https://github.com/borkdude/sci/issues/553)
+- Allow dynamic `:doc` on `def`/`defn` [#554](https://github.com/borkdude/sci/issues/554)
 
 ## 0.3.0
 
diff --git a/sci b/sci
index 97e2a641..e8374356 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit 97e2a641e7de6a59dfa529a504e48f10fdeccb5b
+Subproject commit e8374356c0751bbacde380aa742660e76f20eb10

From c8e630ce754b262443bd790414bc93badcf01850 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Mar 2021 23:31:16 +0200
Subject: [PATCH 130/145] babashka.repl#30: info and lookup support

---
 babashka.nrepl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babashka.nrepl b/babashka.nrepl
index 15ff3c1b..14d1c5b6 160000
--- a/babashka.nrepl
+++ b/babashka.nrepl
@@ -1 +1 @@
-Subproject commit 15ff3c1b43bfc30e806336547bdb0918f9e2521c
+Subproject commit 14d1c5b61e6de16f9fbd7c397a0de4fe6d871d2e

From 76c7167d2bc734b38e8638711918cddc4d1281d5 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 28 Mar 2021 23:42:03 +0200
Subject: [PATCH 131/145] babashka.repl#30: info and lookup support

---
 CHANGELOG.md   | 4 ++++
 babashka.nrepl | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d057a676..148c6c7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,10 @@ Babashka.fs:
 
 - Create target dir automatically in `copy-tree`
 
+Babashka.nrepl:
+
+- Implement `cider-nrepl` `info` / `lookup` op [#30](https://github.com/babashka/babashka.nrepl/issues/30) [(@brdloush)](https://github.com/brdloush)
+
 Babashka.process:
 
 - Support tokenizing single string [#39](https://github.com/babashka/process/issues/39)
diff --git a/babashka.nrepl b/babashka.nrepl
index 14d1c5b6..aac85b85 160000
--- a/babashka.nrepl
+++ b/babashka.nrepl
@@ -1 +1 @@
-Subproject commit 14d1c5b61e6de16f9fbd7c397a0de4fe6d871d2e
+Subproject commit aac85b85f6b8a868e250e337d54e0e1f455ec481

From 86cb997defbc848a66b198bbdaf04e963bbb9629 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 29 Mar 2021 10:05:52 +0200
Subject: [PATCH 132/145] babashka.nrepl: fix arglists formatting

---
 babashka.nrepl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babashka.nrepl b/babashka.nrepl
index aac85b85..3a790c3d 160000
--- a/babashka.nrepl
+++ b/babashka.nrepl
@@ -1 +1 @@
-Subproject commit aac85b85f6b8a868e250e337d54e0e1f455ec481
+Subproject commit 3a790c3d378ddda190d650202cefba9b9930176c

From 4e667679a596fb105aa2e763db8a5bcf01b4a710 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 29 Mar 2021 23:57:13 +0200
Subject: [PATCH 133/145] CHANGELOG [skip ci]

---
 CHANGELOG.md                  |  7 ++++++-
 src/babashka/main.clj         | 20 +++++++++-----------
 test/babashka/bb_edn_test.clj |  9 +++++++++
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 148c6c7c..83219aa3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,12 @@
 
 For a list of breaking changes, check [here](#breaking-changes).
 
-## 0.3.1
+## 0.3.1 (unreleased)
+
+Preliminary docs:
+
+bb.edn: https://book.babashka.org/master.html#_bb_edn
+-m with fully qualified symbol: https://book.babashka.org/master.html#_invoking_a_main_function 
 
 Babashka proper:
 
diff --git a/src/babashka/main.clj b/src/babashka/main.clj
index 3a7a624d..1ff1d672 100644
--- a/src/babashka/main.clj
+++ b/src/babashka/main.clj
@@ -104,8 +104,6 @@
 
 (defn print-help [_ctx _command-line-args]
   (println (str "Babashka v" version))
-  ;; (println (str "sci v" (str/trim (slurp (io/resource "SCI_VERSION")))))
-  (println)
   (println "
 Help:
 
@@ -114,6 +112,14 @@ Help:
   describe           Print an EDN map with information about this version of babashka.
   doc <var|ns>       Print docstring of var or namespace. Requires namespace if necessary.
 
+Evaluation:
+
+  -e, --eval <expr>    Evaluate an expression.
+  -f, --file <path>    Evaluate a file.
+  -cp, --classpath     Classpath to use.
+  -m, --main <ns|var>  Call the -main function from a namespace or call a fully qualified var.
+  --verbose            Print debug information and entire stacktrace in case of exception.
+
 REPL:
 
   Usage: <repl-command> [port/host] [classpath-opt]
@@ -133,15 +139,7 @@ Packaging:
 
   uberjar    <jar> [eval-opts]   Similar to --uberscript but creates jar file.
 
-Evaluation:
-
-  -e, --eval <expr>    Evaluate an expression.
-  -f, --file <path>    Evaluate a file.
-  -cp, --classpath     Classpath to use.
-  -m, --main <ns|var>  Call the -main function from a namespace or call a fully qualified var.
-  --verbose            Print debug information and entire stacktrace in case of exception.
-
-In- and output flags:
+In- and output flags (to be used with -e on the command line):
 
   -i                 Bind *input* to a lazy seq of lines from stdin.
   -I                 Bind *input* to a lazy seq of EDN values from stdin.
diff --git a/test/babashka/bb_edn_test.clj b/test/babashka/bb_edn_test.clj
index f99d54b2..41ad4e55 100644
--- a/test/babashka/bb_edn_test.clj
+++ b/test/babashka/bb_edn_test.clj
@@ -36,3 +36,12 @@
   (with-config '{:deps {medley/medley {:mvn/version "1.3.0"}}}
     (is (= '{1 {:id 1}, 2 {:id 2}}
            (bb "-e" "(require 'medley.core)" "-e" "(medley.core/index-by :id [{:id 1} {:id 2}])")))))
+
+;; TODO:
+;; Do we want to support the same parsing as the clj CLI?
+;; Or do we want `--aliases :foo:bar`
+;; Let's wait for a good use case
+#_(deftest alias-deps-test
+  (with-config '{:aliases {:medley {:deps {medley/medley {:mvn/version "1.3.0"}}}}}
+    (is (= '{1 {:id 1}, 2 {:id 2}}
+           (bb "-A:medley" "-e" "(require 'medley.core)" "-e" "(medley.core/index-by :id [{:id 1} {:id 2}])")))))

From 69c1b65689eb76ee9d3db6bbe2c410b545422a77 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Tue, 30 Mar 2021 11:27:23 +0200
Subject: [PATCH 134/145] help

---
 src/babashka/main.clj | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/babashka/main.clj b/src/babashka/main.clj
index 1ff1d672..4d9b7a0c 100644
--- a/src/babashka/main.clj
+++ b/src/babashka/main.clj
@@ -105,6 +105,21 @@
 (defn print-help [_ctx _command-line-args]
   (println (str "Babashka v" version))
   (println "
+Usage: bb [classpath opts] [eval opts] [cmdline args]
+or:    bb [classpath opts] file [cmdline args]
+or:    bb [classpath opts] subcommand [subcommand opts] [cmdline args]
+
+Classpath:
+
+  -cp, --classpath     Classpath to use.
+
+Evaluation:
+
+  -e, --eval <expr>    Evaluate an expression.
+  -f, --file <path>    Evaluate a file.
+  -m, --main <ns|var>  Call the -main function from a namespace or call a fully qualified var.
+  --verbose            Print debug information and entire stacktrace in case of exception.
+
 Help:
 
   help, -h or -?     Print this help text.
@@ -112,17 +127,9 @@ Help:
   describe           Print an EDN map with information about this version of babashka.
   doc <var|ns>       Print docstring of var or namespace. Requires namespace if necessary.
 
-Evaluation:
-
-  -e, --eval <expr>    Evaluate an expression.
-  -f, --file <path>    Evaluate a file.
-  -cp, --classpath     Classpath to use.
-  -m, --main <ns|var>  Call the -main function from a namespace or call a fully qualified var.
-  --verbose            Print debug information and entire stacktrace in case of exception.
-
 REPL:
 
-  Usage: <repl-command> [port/host] [classpath-opt]
+  Usage: <repl-command> [port/host]
   Specify port (e.g. 1666) or host and port separated by colon (e.g. 127.0.0.1:1666).
 
   repl               Start REPL. Use rlwrap for history. When invoking bb with no args, this is the default command.
@@ -135,11 +142,11 @@ Clojure:
 
 Packaging:
 
-  uberscript <file> [eval-opts]  Collect preloads, -e, -f and -m and all required namespaces from the classpath into a single file.
+  uberscript <file> [main-opt]  Collect all required namespaces from the classpath into a single file. Optionally sets `-m` as the main function.
 
-  uberjar    <jar> [eval-opts]   Similar to --uberscript but creates jar file.
+  uberjar    <jar> [main-opt]   Similar to uberscript but creates jar file.
 
-In- and output flags (to be used with -e on the command line):
+In- and output flags (only to be used with -e one-liners):
 
   -i                 Bind *input* to a lazy seq of lines from stdin.
   -I                 Bind *input* to a lazy seq of EDN values from stdin.
@@ -147,8 +154,7 @@ In- and output flags (to be used with -e on the command line):
   -O                 Write EDN values to stdout.
   --stream           Stream over lines or EDN values from stdin. Combined with -i or -I *input* becomes a single value per iteration.
 
-If the first argument is not any of the above options, then it treated as a file if it exists, or as an expression otherwise.
-Everything after that is bound to *command-line-args*.
+Remaining arguments are bound to *command-line-args*.
 
 Use -- to separate script command line args from bb command line args.
 ")

From 093f9828f0763543091ce569c7996aee604e461c Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Tue, 30 Mar 2021 11:29:46 +0200
Subject: [PATCH 135/145] help

---
 src/babashka/main.clj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/babashka/main.clj b/src/babashka/main.clj
index 4d9b7a0c..03d88b47 100644
--- a/src/babashka/main.clj
+++ b/src/babashka/main.clj
@@ -143,7 +143,6 @@ Clojure:
 Packaging:
 
   uberscript <file> [main-opt]  Collect all required namespaces from the classpath into a single file. Optionally sets `-m` as the main function.
-
   uberjar    <jar> [main-opt]   Similar to uberscript but creates jar file.
 
 In- and output flags (only to be used with -e one-liners):

From 6f133ed9f26c978813490f7e9450c8e35699a3a1 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Tue, 30 Mar 2021 11:31:58 +0200
Subject: [PATCH 136/145] help

---
 src/babashka/main.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/babashka/main.clj b/src/babashka/main.clj
index 03d88b47..a3d15236 100644
--- a/src/babashka/main.clj
+++ b/src/babashka/main.clj
@@ -153,8 +153,8 @@ In- and output flags (only to be used with -e one-liners):
   -O                 Write EDN values to stdout.
   --stream           Stream over lines or EDN values from stdin. Combined with -i or -I *input* becomes a single value per iteration.
 
+File names take precedence over subcommand names.
 Remaining arguments are bound to *command-line-args*.
-
 Use -- to separate script command line args from bb command line args.
 ")
   [nil 0])

From c9826b9694b0f2f9c97999b5c3cdfd4892f9d052 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Tue, 30 Mar 2021 11:32:30 +0200
Subject: [PATCH 137/145] help

---
 src/babashka/main.clj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/babashka/main.clj b/src/babashka/main.clj
index a3d15236..baa4d9ae 100644
--- a/src/babashka/main.clj
+++ b/src/babashka/main.clj
@@ -155,8 +155,7 @@ In- and output flags (only to be used with -e one-liners):
 
 File names take precedence over subcommand names.
 Remaining arguments are bound to *command-line-args*.
-Use -- to separate script command line args from bb command line args.
-")
+Use -- to separate script command line args from bb command line args.")
   [nil 0])
 
 (defn print-doc [ctx command-line-args]

From e95a10cf6b8577e940817a6bf3a7da58ffda42d4 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Tue, 30 Mar 2021 11:41:12 +0200
Subject: [PATCH 138/145] help

---
 src/babashka/main.clj | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/babashka/main.clj b/src/babashka/main.clj
index baa4d9ae..364b1749 100644
--- a/src/babashka/main.clj
+++ b/src/babashka/main.clj
@@ -129,12 +129,9 @@ Help:
 
 REPL:
 
-  Usage: <repl-command> [port/host]
-  Specify port (e.g. 1666) or host and port separated by colon (e.g. 127.0.0.1:1666).
-
-  repl               Start REPL. Use rlwrap for history. When invoking bb with no args, this is the default command.
-  socket-repl        Start socket REPL.
-  nrepl-server       Start nREPL server.
+  repl                 Start REPL. Use rlwrap for history.
+  socket-repl  [addr]  Start a socket REPL. Addr opt defaults to localhost:1666.
+  nrepl-server [addr]  Start nREPL server. Address option defaults to locahost:1667.
 
 Clojure:
 
@@ -155,7 +152,8 @@ In- and output flags (only to be used with -e one-liners):
 
 File names take precedence over subcommand names.
 Remaining arguments are bound to *command-line-args*.
-Use -- to separate script command line args from bb command line args.")
+Use -- to separate script command line args from bb command line args.
+When no eval opts or subcommand is provided, the implicit subcommand is repl.")
   [nil 0])
 
 (defn print-doc [ctx command-line-args]

From 02cecb259d44c9148906cd97f0dc0958e0e0f92e Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Tue, 30 Mar 2021 17:57:07 +0200
Subject: [PATCH 139/145] help

---
 src/babashka/main.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/babashka/main.clj b/src/babashka/main.clj
index 364b1749..12515de2 100644
--- a/src/babashka/main.clj
+++ b/src/babashka/main.clj
@@ -139,8 +139,8 @@ Clojure:
 
 Packaging:
 
-  uberscript <file> [main-opt]  Collect all required namespaces from the classpath into a single file. Optionally sets `-m` as the main function.
-  uberjar    <jar> [main-opt]   Similar to uberscript but creates jar file.
+  uberscript <file> [eval-opt]  Collect all required namespaces from the classpath into a single file. Accepts additional eval opts, like `-m`.
+  uberjar    <jar>  [eval-opt]  Similar to uberscript but creates jar file.
 
 In- and output flags (only to be used with -e one-liners):
 

From 6a7baf2a9069d33aab3c08907d24f760256053e3 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Tue, 30 Mar 2021 18:06:56 +0200
Subject: [PATCH 140/145] v0.3.1

---
 resources/BABASHKA_VERSION    |  2 +-
 src/babashka/main.clj         | 21 +++++++++++----------
 test/babashka/bb_edn_test.clj |  8 ++++++--
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/resources/BABASHKA_VERSION b/resources/BABASHKA_VERSION
index 9f6605e0..a2268e2d 100644
--- a/resources/BABASHKA_VERSION
+++ b/resources/BABASHKA_VERSION
@@ -1 +1 @@
-0.3.1-SNAPSHOT
\ No newline at end of file
+0.3.1
\ No newline at end of file
diff --git a/src/babashka/main.clj b/src/babashka/main.clj
index 12515de2..ccd08e7e 100644
--- a/src/babashka/main.clj
+++ b/src/babashka/main.clj
@@ -111,7 +111,7 @@ or:    bb [classpath opts] subcommand [subcommand opts] [cmdline args]
 
 Classpath:
 
-  -cp, --classpath     Classpath to use.
+  -cp, --classpath     Classpath to use. Overrides bb.edn classpath.
 
 Evaluation:
 
@@ -562,8 +562,16 @@ When no eval opts or subcommand is provided, the implicit subcommand is repl.")
             uberscript-sources (atom ())
             classpath (or classpath
                           (System/getenv "BABASHKA_CLASSPATH"))
-            _ (when classpath
-                (cp/add-classpath classpath))
+            _ (if classpath
+                (cp/add-classpath classpath)
+                ;; when classpath isn't set, we calculate it from bb.edn, if present
+                (let [bb-edn-file (or (System/getenv "BABASHKA_EDN")
+                                      "bb.edn")]
+                  (when (fs/exists? bb-edn-file)
+                    (let [edn (edn/read-string (slurp bb-edn-file))]
+                      (vreset! bb-edn edn)))
+                  ;; we mutate the atom from tests as well, so despite the above it can contain a bb.edn
+                  (when-let [bb-edn @bb-edn] (deps/add-deps bb-edn))))
             abs-path (when file
                        (let [abs-path (.getAbsolutePath (io/file file))]
                          (vars/bindRoot sci/file abs-path)
@@ -715,13 +723,6 @@ When no eval opts or subcommand is provided, the implicit subcommand is repl.")
         exit-code))))
 
 (defn main [& args]
-  (let [bb-edn-file (or (System/getenv "BABASHKA_EDN")
-                        "bb.edn")]
-    (when (fs/exists? bb-edn-file)
-      (let [edn (edn/read-string (slurp bb-edn-file))]
-        (vreset! bb-edn edn)))
-    ;; we mutate the atom from tests as well, so despite the above it can contain a bb.edn
-    (when-let [bb-edn @bb-edn] (deps/add-deps bb-edn)))
   (let [opts (parse-opts args)]
     (exec opts)))
 
diff --git a/test/babashka/bb_edn_test.clj b/test/babashka/bb_edn_test.clj
index 41ad4e55..b0488b4f 100644
--- a/test/babashka/bb_edn_test.clj
+++ b/test/babashka/bb_edn_test.clj
@@ -4,7 +4,7 @@
    [babashka.test-utils :as test-utils]
    [clojure.edn :as edn]
    [clojure.string :as str]
-   [clojure.test :as test :refer [deftest is]]))
+   [clojure.test :as test :refer [deftest is testing]]))
 
 (defn bb [& args]
   (edn/read-string
@@ -35,7 +35,11 @@
 (deftest deps-test
   (with-config '{:deps {medley/medley {:mvn/version "1.3.0"}}}
     (is (= '{1 {:id 1}, 2 {:id 2}}
-           (bb "-e" "(require 'medley.core)" "-e" "(medley.core/index-by :id [{:id 1} {:id 2}])")))))
+           (bb "-e" "(require 'medley.core)" "-e" "(medley.core/index-by :id [{:id 1} {:id 2}])"))))
+  (testing "--classpath option overrides bb.edn"
+    (with-config '{:deps {medley/medley {:mvn/version "1.3.0"}}}
+      (is (= "src"
+             (bb "-cp" "src" "-e" "(babashka.classpath/get-classpath)"))))))
 
 ;; TODO:
 ;; Do we want to support the same parsing as the clj CLI?

From 95485ba8be4ae2f24e1f807d7b94fe240332454b Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Tue, 30 Mar 2021 18:11:09 +0200
Subject: [PATCH 141/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83219aa3..6b863e72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,18 +2,13 @@
 
 For a list of breaking changes, check [here](#breaking-changes).
 
-## 0.3.1 (unreleased)
-
-Preliminary docs:
-
-bb.edn: https://book.babashka.org/master.html#_bb_edn
--m with fully qualified symbol: https://book.babashka.org/master.html#_invoking_a_main_function 
+## 0.3.1
 
 Babashka proper:
 
-- Support `bb.edn` project config with `:paths` and `:deps`
+- Support `bb.edn` project config with `:paths` and `:deps`. See [docs](https://book.babashka.org/index.html#_bb_edn).
 - Main options are now supported to be called as `bb option` instead of `bb --option`
-- Support fully qualified symbol in `--main` option [#758](https://github.com/babashka/babashka/issues/758)
+- Support fully qualified symbol in `--main` option [#758](https://github.com/babashka/babashka/issues/758). See [docs](https://book.babashka.org/index.html#_invoking_a_main_function ).
 - Support new `doc` option to retrieve a docstring from the command line
 
 Babashka.fs:

From 34a6960aad578e289bcb16a90f268f08b22680e9 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Tue, 30 Mar 2021 18:12:53 +0200
Subject: [PATCH 142/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b863e72..997fb345 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Babashka proper:
 - Main options are now supported to be called as `bb option` instead of `bb --option`
 - Support fully qualified symbol in `--main` option [#758](https://github.com/babashka/babashka/issues/758). See [docs](https://book.babashka.org/index.html#_invoking_a_main_function ).
 - Support new `doc` option to retrieve a docstring from the command line
+- Rewrite CLI arg parsing to to subcommand style invocations
 
 Babashka.fs:
 

From bf4e4a0283d3a36abf6dc5248dda59577d8e0785 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Tue, 30 Mar 2021 19:18:15 +0200
Subject: [PATCH 143/145] Version bump

---
 resources/BABASHKA_RELEASED_VERSION | 2 +-
 resources/BABASHKA_VERSION          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/BABASHKA_RELEASED_VERSION b/resources/BABASHKA_RELEASED_VERSION
index 0d91a54c..a2268e2d 100644
--- a/resources/BABASHKA_RELEASED_VERSION
+++ b/resources/BABASHKA_RELEASED_VERSION
@@ -1 +1 @@
-0.3.0
+0.3.1
\ No newline at end of file
diff --git a/resources/BABASHKA_VERSION b/resources/BABASHKA_VERSION
index a2268e2d..41d76f43 100644
--- a/resources/BABASHKA_VERSION
+++ b/resources/BABASHKA_VERSION
@@ -1 +1 @@
-0.3.1
\ No newline at end of file
+0.3.2-SNAPSHOT
\ No newline at end of file

From e898d1fea370ee9f3eae0601f0a9774726e55629 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Tue, 30 Mar 2021 19:29:24 +0200
Subject: [PATCH 144/145] CHANGELOG [skip ci]

---
 CHANGELOG.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 997fb345..2afb7f07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,10 +7,9 @@ For a list of breaking changes, check [here](#breaking-changes).
 Babashka proper:
 
 - Support `bb.edn` project config with `:paths` and `:deps`. See [docs](https://book.babashka.org/index.html#_bb_edn).
-- Main options are now supported to be called as `bb option` instead of `bb --option`
+- Rewrite CLI arg parsing to to subcommand style invocations: `bb --uberjar` becomes `bb uberjar`
 - Support fully qualified symbol in `--main` option [#758](https://github.com/babashka/babashka/issues/758). See [docs](https://book.babashka.org/index.html#_invoking_a_main_function ).
 - Support new `doc` option to retrieve a docstring from the command line
-- Rewrite CLI arg parsing to to subcommand style invocations
 
 Babashka.fs:
 

From d25019aeaf9b00185cbfcadc0da83df69dad2857 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Thu, 1 Apr 2021 21:27:20 +0200
Subject: [PATCH 145/145] sci: clean meta on nested map

---
 sci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci b/sci
index e8374356..106919aa 160000
--- a/sci
+++ b/sci
@@ -1 +1 @@
-Subproject commit e8374356c0751bbacde380aa742660e76f20eb10
+Subproject commit 106919aad41062055828df832acb863080e4b5bd