Add jdk 19 loom virtual threads support to master

.circleci/config.yml

@@ -29,7 +29,7 @@ jobs:
       - run:
           name: Generate config
           command: |
-            /tmp/bbb .circleci/script/short_ci.clj > generated_config.yml
+            /tmp/bbb .circleci/script/gen_ci.clj > generated_config.yml
       - continuation/continue:
           configuration_path: generated_config.yml
 

.circleci/script/short_ci.clj → .circleci/script/gen_ci.clj

@@ -1,4 +1,4 @@
-(ns short-ci
+(ns gen-ci
   (:require
     [babashka.tasks :as tasks]
     [clj-yaml.core :as yaml]
@@ -72,14 +72,16 @@
            "java -jar ./target/babashka-$(cat resources/BABASHKA_VERSION)-standalone.jar .circleci/script/docker.clj"}}]))))
 
 (defn jvm
-  [shorted?]
+  [shorted? graalvm-home]
   (gen-job
     shorted?
     (ordered-map
       :docker            [{:image "circleci/clojure:openjdk-11-lein-2.9.8-bullseye"}]
       :working_directory "~/repo"
       :environment       {:LEIN_ROOT         "true"
-                          :BABASHKA_PLATFORM "linux"}
+                          :BABASHKA_PLATFORM "linux"
+                          :GRAALVM_VERSION   "22.3.0"
+                          :GRAALVM_HOME      graalvm-home}
       :resource_class    "large"
       :steps
       (gen-steps
@@ -89,6 +91,7 @@
          {:restore_cache {:keys ["v1-dependencies-{{ checksum \"project.clj\" }}-{{ checksum \"deps.edn\" }}"
                                  "v1-dependencies-"]}}
          (run "Install Clojure" "sudo script/install-clojure")
+         (run "Download GraalVM" "script/install-graalvm")
          (run
            "Run JVM tests"
            "export BABASHKA_FEATURE_JDBC=true
@@ -102,6 +105,8 @@ script/uberjar
 VERSION=$(cat resources/BABASHKA_VERSION)
 jar=target/babashka-$VERSION-standalone.jar
 cp $jar /tmp/release
+export PATH=$GRAALVM_HOME/bin:$PATH
+export JAVA_HOME=$GRAALVM_HOME
 java -jar $jar script/reflection.clj
 reflection=\"babashka-$VERSION-reflection.json\"
 java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$jar\"
@@ -149,6 +154,8 @@ java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$refl
                  :steps (gen-steps shorted?
                                    (filter some?
                                            [:checkout
+                                            (when (contains? #{"linux" "linux-aarch64"} platform)
+                                              (run "Check max glibc version" "script/check_glibc.sh"))
                                             {:attach_workspace {:at "/tmp"}}
                                             (run "Pull Submodules" "git submodule init\ngit submodule update")
                                             {:restore_cache
@@ -168,7 +175,7 @@ java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$refl
                                             {:persist_to_workspace {:root  "/tmp"
                                                                     :paths ["release"]}}
                                             {:save_cache
-                                             {:paths ["~/.m2" "~/graalvm-ce-java19-22.3.0"]
+                                             {:paths ["~/.m2" "~/graalvm-ce-java11-22.3.0"]
                                               :key   cache-key}}
                                             {:store_artifacts {:path        "/tmp/release"
                                                                :destination "release"}}
@@ -180,8 +187,8 @@ java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$refl
   (let [docker-executor-conf  {:docker [{:image "circleci/clojure:openjdk-11-lein-2.9.8-bullseye"}]}
         machine-executor-conf {:machine {:image "ubuntu-2004:202111-01"}}
         mac-executor-conf     {:macos {:xcode "14.0.0"}}
-        linux-graalvm-home    "/home/circleci/graalvm-ce-java19-22.3.0"
-        mac-graalvm-home      "/Users/distiller/graalvm-ce-java19-22.3.0/Contents/Home"]
+        linux-graalvm-home    "/home/circleci/graalvm-ce-java11-22.3.0"
+        mac-graalvm-home      "/Users/distiller/graalvm-ce-java11-22.3.0/Contents/Home"]
     (ordered-map
       :version   2.1
       :commands
@@ -192,7 +199,7 @@ java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$refl
            :command
            "docker run --privileged --rm tonistiigi/binfmt --install all\ndocker buildx create --name ci-builder --use"}}]}}
       :jobs      (ordered-map
-                   :jvm (jvm shorted?)
+                   :jvm (jvm shorted? linux-graalvm-home)
                    :linux (unix shorted? false false "amd64" docker-executor-conf "large" linux-graalvm-home "linux")
                    :linux-static
                    (unix shorted? true true "amd64" docker-executor-conf "large" linux-graalvm-home "linux")

.cirrus.yml

@@ -6,7 +6,7 @@ task:
   env:
     LEIN_ROOT: "true"
     GRAALVM_VERSION: "22.3.0"
-    GRAALVM_HOME: ${HOME}/graalvm-ce-java19-22.3.0/Contents/Home
+    GRAALVM_HOME: ${HOME}/graalvm-ce-java11-22.3.0/Contents/Home
     BABASHKA_PLATFORM: macos # used in release script
     BABASHKA_ARCH: aarch64
     BABASHKA_TEST_ENV: native
@@ -20,6 +20,7 @@ task:
     sudo script/install-leiningen
     script/install-graalvm
     export PATH=$GRAALVM_HOME/bin:$PATH
+    export JAVA_HOME=$GRAALVM_HOME
     sudo /usr/sbin/softwareupdate --install-rosetta --agree-to-license
     java -version
 

.clj-kondo/config.edn

@@ -5,4 +5,5 @@
            babashka.impl.File/gen-wrapper-fn-2 clojure.core/def
            babashka.impl.Pattern/gen-wrapper-fn-2 clojure.core/def
            babashka.impl.Pattern/gen-constants clojure.core/declare}
- :linters {:unsorted-required-namespaces {:level :warning}}}
+ :linters {:unsorted-required-namespaces {:level :warning}}
+ :hooks {:analyze-call {clojure.core/requiring-resolve hooks.mine/req-resolve}}}

CHANGELOG.md

@@ -5,12 +5,132 @@ For a list of breaking changes, check [here](#breaking-changes).
 A preview of the next release can be installed from
 [babashka-dev-builds](https://github.com/babashka/babashka-dev-builds).
 
+[Babashka](https://github.com/babashka/babashka): Native, fast starting Clojure interpreter for scripting
+
 ## Unreleased
+- Add jdk19 loom virtual threads support to master
+- Add more java.time and related classes with the goal of supporting juxt.tick https://github.com/juxt/tick/issues/86
+- [#1000](https://github.com/babashka/babashka/issues/1000): add lib tests for xforms ([@bobisageek](https://github.com/bobisageek))
+- [#1482](https://github.com/babashka/babashka/issues/1482): make loading of libs thread safe
+- [#1487](https://github.com/babashka/babashka/issues/1487): `babashka.tasks/clojure` should be supported without arguments to start a REPL
+- [#1496](https://github.com/babashka/babashka/issues/1496): Add `set-agent-send-executor!` and `set-agent-send-off-executor!`
+
+## 1.1.173 (2023-02-04)
+
+- [#1473](https://github.com/babashka/babashka/issues/1473): support `--config` in other dir + `:local/root` ([@lispyclouds](https://github.com/lispyclouds))
+- Compatibility with `clojure.tools.namespace.repl/refresh` and `clojure.java.classpath`
+- `(clojure.lang.RT/baseLoader)` now returns classloader with babashka dependencies on classpath
+- Support reading tags from `data_readers.clj` and `data_readers.cljc`
+- Don't exit REPL when `babashka.deps/add-deps` fails
+- Fix [#1474](https://github.com/babashka/babashka/issues/1474): when `.bb` file is in different artifact, `.clj` file is loaded first if it appears first on classpath
+- Support for `*loaded-libs*` and `(loaded-libs)`
+- Bump rewrite-clj to `1.1.46`
+- Bump http-client to `0.0.3`
+- Bump fs to `0.2.15`
+- Bump process to `0.4.16`
+
+## 1.1.172 (2023-01-23)
+
+- [#1472](https://github.com/babashka/babashka/issues/1472): fix tokenization of `babashka.tasks/clojure`: command was tokenized twice (regression was introduced in `1.0.168`)
+- **BREAKING**: Bump `babashka.process`: change default for `:out :append` to `:out :write`. This default is undocumented so the impact should be small.
+
+## 1.1.171 (2023-01-23)
+
+- [#1467](https://github.com/babashka/babashka/issues/1467): **BREAKING**: avoid printing results, unless `--prn` is enabled (aside from `-e`, `-o` and `-O`).
+- Include [http-client](https://github.com/babashka/http-client) as built-in library
+- SCI: support `add-watch` on vars
+- Compatibility with [eftest](https://github.com/weavejester/eftest) test runner (see [demo](https://twitter.com/borkdude/status/1616886788898885632))
+- Add classes:
+  - `java.util.concurrent.Callable`
+  - `java.util.concurrent.ExecutorService`
+- Expose `clojure.main` `main` and `repl-caught`
+- Switch `clojure.test/*report-counters*` to ref instead of atom for compatibility with [kaocha](https://github.com/lambdaisland/kaocha)
+- Allow `java.io.OutputStream` to be proxied, for [kaocha](https://github.com/lambdaisland/kaocha)
+- Support qualified method names in `proxy` and ignore namespace
+
+## 1.0.170 (2023-01-19)
+
+- [#1463](https://github.com/babashka/babashka/issues/1463): Add `java.util.jar.Attributes` class ([@jeroenvandijk](https://github.com/jeroenvandijk))
+- [#1456](https://github.com/babashka/babashka/issues/1456): allow `*warn-on-reflection*` and `*unchecked-math*` to be set in socket REPL and nREPL ([@axks](https://github.com/axks))
+- SCI: macroexpansion error location improvement
+- Add compatibility with [tab](https://github.com/eerohele/tab) and [solenoid](https://github.com/adam-james-v/solenoid)
+- Bump babashka.cli and babashka.fs
+- New classes:
+  - `java.util.jar.Attributes`
+  - `java.util.concurrent.ThreadFactory`
+  - `java.lang.Thread$UncaughtExceptionHandler`
+  - `java.lang.Thread$UncaughtExceptionHandler`
+  - `java.util.concurrent.BlockingQueue`
+  - `java.util.concurrent.ArrayBlockingQueue`
+  - `java.util.concurrent.ThreadFactory`
+  - `java.lang.Thread$UncaughtExceptionHandler`
+  - `java.util.concurrent.Semaphore`
+- Expose more httpkit.server functions: `with-channel`, `on-close`, `close`
+
+## 1.0.169 (2023-01-03)
+
+- Implement `ns`, `lazy-seq` as macro
+- Support `--dev-build` flag in installation script
+- [#1451](https://github.com/babashka/babashka/issues/1451): Allow passing explicit file and line number to clojure.test ([@matthewdowney](https://github.com/matthewdowney))
+- [#1280](https://github.com/babashka/babashka/issues/1280): babashka REPL doesn't quit right after Ctrl-d ([@formerly-a-trickster](https://github.com/formerly-a-trickster) and Alice Margatroid)
+- [#1446](https://github.com/babashka/babashka/issues/1446): add `pprint/code-dispatch`
+- Update zlib to version `1.2.13` ([@thiagokokada](https://github.com/thiagokokada))
+- [#1454](https://github.com/babashka/babashka/issues/1454): Add `babashka.process` to `print-deps` output
+- Update `deps.clj` / clojure tools to `1.11.1.1208`
+- Add `reader-conditional` function
+- Fix pretty printing (with `clojure.pprint`) of vars
+- Upgrade built-in `spec.alpha`
+- SCI performance improvements: faster JVM interop
+
+## 1.0.168 (2022-12-07)
+
+- `loop*`, `fn*` are now special forms and `loop`, `fn`, `defn`, `defmacro`, `and` and `or` are implemented as macros. This restores compatibility with [rcf](https://github.com/borkdude/hyperfiddle-rcf)
+- fs: don't touch dirs in `split-ext`
+- Update to babashka process to v0.4.13: support `(process opts? & args)` syntax everywhere
+- [#1438](https://github.com/babashka/babashka/issues/1438): expose `query-string` and `url-encode` functions from org.httpkit.client ([@bobisageek](https://github.com/bobisageek))
+- Add `java.util.InputMismatchException`
+
+## 1.0.167 (2022-11-30)
+
+- [#1433](https://github.com/babashka/babashka/issues/1433): spec source as built-in fallback. When not including the
+  [clojure.spec.alpha](https://github.com/babashka/spec.alpha) fork as a
+  library, babashka loads a bundled version, when `clojure.spec.alpha` is required.
+- [#1430](https://github.com/babashka/babashka/issues/1430): Fix issue with `bb tasks` throwing on empty display tasks list.
+- Add note about BSOD when using WSL1, see [README.md/quickstart](https://github.com/LouDnl/babashka#quickstart)
+- SCI: performance improvements
+- Better error locations for interop ([@bobisageek](https://github.com/bobisageek))
+- Fix [babashka/babashka.nrepl#59](https://github.com/babashka/babashka.nrepl/issues/59): do not output extra new line with cider pprint
+- Use `namespace-munge` instead of `munge` for doing ns -> file lookup
+
+## 1.0.166 (2022-11-24)
+
+See the [Testing babashka scripts](https://blog.michielborkent.nl/babashka-test-runner.html) blog post for how to run tests with this release.
+
+- Compatibility with Cognitest [test-runner](https://github.com/cognitect-labs/test-runner) and [tools.namespace](https://github.com/clojure/tools.namespace)
+- Add `run-test` and `run-test-var` to `clojure.test`
+- Compile distributed uberjar using GraalVM, fixes `babashka.process/exec` for Nix
+- [#1414](https://github.com/babashka/babashka/issues/1414): preserve metadata on exec task function argument map
+- [#1269](https://github.com/babashka/babashka/issues/1269): add lib tests for sluj ([@bobisageek](https://github.com/bobisageek))
+- Update nix app example in docs
+- Add `java.lang.Error` and `java.net.URLClassLoader` (only for compatibility with the `clojure.java.classpath` lib)
+- Deps.clj `deps.clj: 1.11.1.1200`
+- Upgrade timbre to `6.0.1`
+- Performance improvements in SCI
+- SCI: preserve stack information on `throw` expressions
+
+## 1.0.165 (2022-11-01)
 
 - Fix [#1401](https://github.com/babashka/babashka/issues/1401): mutation of `deftype` field should be visible in protocol method
 - Fix [#1405](https://github.com/babashka/babashka/issues/1405): drop name metadata from conditionally defined var
 - [#602](https://github.com/babashka/babashka/issues/602): add lib tests for clj-commons/fs ([@bobisageek](https://github.com/bobisageek))
 - Add `java.net.URLConnection` class
+- Add `java.time.zone.ZoneRules` class
+- Copy more docstrings for core macros and vars
+- Bump `core.async` to `1.6.673`
+- Implement `in-ns` as function, rather than special form ([@SignSpice](https://github.com/SignSpice))
+- Bump `deps.clj` to `1.11.1.1182`
+- Bump GraalVM to `22.3.0`
+- SCI: don't rely on metadata for record implementation
 
 ## 1.0.164 (2022-10-17)
 
@@ -1150,6 +1270,14 @@ Details about releases prior to v0.1.0 can be found
 
 ## Breaking changes
 
+### v1.1.172
+
+- Bump `babashka.process`: change default for `:out :append` to `:out :write`. This default is undocumented so the impact should be small.
+
+### v1.1.171
+
+- [#1467](https://github.com/babashka/babashka/issues/1467): avoid printing results, unless `--prn` is enabled (aside from `-e`, `-o` and `-O`).
+
 ### v0.2.4
 
 - Remove cheshire smile functions [#658](https://github.com/babashka/babashka/issues/658)

Dockerfile

@@ -7,8 +7,9 @@ WORKDIR "/opt"
 
 ENV GRAALVM_VERSION="22.3.0"
 ARG TARGETARCH
-ENV BABASHKA_ARCH=${TARGETARCH}
-ENV GRAALVM_ARCH=${TARGETARCH}
+# Do not set those directly, use TARGETARCH instead
+ENV BABASHKA_ARCH=
+ENV GRAALVM_ARCH=
 RUN if [ "${TARGETARCH}" = "" ] || [ "${TARGETARCH}" = "amd64" ]; then \
       export GRAALVM_ARCH=amd64; export BABASHKA_ARCH=x86_64; \
     elif [ "${TARGETARCH}" = "arm64" ]; then \

Dockerfile.alpine

@@ -4,9 +4,11 @@ COPY bb /bin/bb
 
 RUN chmod +x /bin/bb
 
+# TODO: See https://github.com/sgerrand/alpine-pkg-glibc/issues/185 and remove the `--force-overwrite`s when resolved.
+
 RUN apk --no-cache add curl ca-certificates tar && \
     curl -Ls https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk > /tmp/glibc-2.28-r0.apk && \
-    apk add --allow-untrusted /tmp/glibc-2.28-r0.apk
+    apk add --allow-untrusted --force-overwrite /tmp/glibc-2.28-r0.apk
 RUN echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf
 
 # TODO: Run actual native tests when they are ported
@@ -21,7 +23,7 @@ FROM alpine:3
 
 RUN apk --no-cache add curl ca-certificates tar && \
     curl -Ls https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk > /tmp/glibc-2.28-r0.apk && \
-    apk add --allow-untrusted /tmp/glibc-2.28-r0.apk
+    apk add --allow-untrusted --force-overwrite /tmp/glibc-2.28-r0.apk
 RUN echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf
 
 COPY metabom.jar /opt/babashka-metabom.jar