diff --git a/.circleci/script/gen_ci.clj b/.circleci/script/gen_ci.clj index 353ee326..dbc3134c 100644 --- a/.circleci/script/gen_ci.clj +++ b/.circleci/script/gen_ci.clj @@ -5,7 +5,7 @@ [clojure.string :as str] [flatland.ordered.map :refer [ordered-map]])) -(def graalvm-version "21.0.1") +(def graalvm-version "21.0.2") (defn run ([cmd-name cmd] @@ -122,7 +122,7 @@ java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$refl (defn unix [shorted? static? musl? arch executor-conf resource-class graalvm-home platform] (let [env {:LEIN_ROOT "true" - :GRAALVM_VERSION "21.0.1" + :GRAALVM_VERSION "21.0.2" :GRAALVM_HOME graalvm-home :BABASHKA_PLATFORM (if (= "mac" platform) "macos" diff --git a/.cirrus.yml b/.cirrus.yml index a8cacad1..fb50a001 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -5,7 +5,7 @@ task: skip: "changesIncludeOnly('logo/*', '**.md')" env: LEIN_ROOT: "true" - GRAALVM_VERSION: "21.0.1" + GRAALVM_VERSION: "21.0.2" GRAALVM_HOME: ${HOME}/graalvm-${GRAALVM_VERSION}/Contents/Home BABASHKA_PLATFORM: macos # used in release script BABASHKA_ARCH: aarch64 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a02c88de..b74bdbf4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -102,7 +102,7 @@ jobs: runs-on: ${{ matrix.os }} env: LEIN_ROOT: "true" - GRAALVM_VERSION: "21.0.1" + GRAALVM_VERSION: "21.0.2" BABASHKA_PLATFORM: ${{ matrix.name }} # used in release script BABASHKA_TEST_ENV: native BABASHKA_XMX: "-J-Xmx6500m" @@ -126,7 +126,7 @@ jobs: if: "matrix.static == false" uses: graalvm/setup-graalvm@v1 with: - java-version: '21.0.1' + java-version: '21.0.2' distribution: 'graalvm' components: 'native-image' github-token: ${{ secrets.GITHUB_TOKEN }} @@ -135,7 +135,7 @@ jobs: if: "matrix.static == true" uses: graalvm/setup-graalvm@v1 with: - version: '21.0.1' + version: '21.0.2' distribution: 'graalvm' components: 'native-image' native-image-musl: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 062d4d7c..807f3411 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,8 @@ A preview of the next release can be installed from ## Unreleased -- #1660: add `:deps-root` as part of hash to avoid caching issue with `deps.clj` +- [#1660](https://github.com/babashka/babashka/issues/1660): add `:deps-root` as part of hash to avoid caching issue with `deps.clj` +- [#1632](https://github.com/babashka/babashka/issues/1632): fix `(.readPassword (System/console))` by upgrading GraalVM to `21.0.2` ## 1.3.188 (2023-01-12) diff --git a/Dockerfile b/Dockerfile index 6010408a..40873b80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ RUN apt update RUN apt install --no-install-recommends -yy build-essential zlib1g-dev WORKDIR "/opt" -ENV GRAALVM_VERSION="21.0.1" +ENV GRAALVM_VERSION="21.0.2" ARG TARGETARCH # Do not set those directly, use TARGETARCH instead ENV BABASHKA_ARCH= diff --git a/appveyor.yml b/appveyor.yml index 360dea8d..e4e2d072 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,8 +7,8 @@ image: Visual Studio 2022 clone_folder: C:\projects\babashka environment: - GRAALVM_HOME: C:\projects\babashka\graalvm\graalvm-jdk-21.0.1+12.1 - JAVA_HOME: C:\projects\babashka\graalvm\graalvm-jdk-21.0.1+12.1 + GRAALVM_HOME: C:\projects\babashka\graalvm\graalvm-jdk-21.0.2+13.1 + JAVA_HOME: C:\projects\babashka\graalvm\graalvm-jdk-21.0.2+13.1 BABASHKA_XMX: "-J-Xmx5g" skip_commits: @@ -39,7 +39,7 @@ clone_script: build_script: # TODO: Extract the zip by removing the top level folder to remove the hardcoded path for GRAALVM_HOME - cmd: >- - powershell -Command "if (Test-Path('graalvm')) { return } else { (New-Object Net.WebClient).DownloadFile('https://download.oracle.com/graalvm/21/archive/graalvm-jdk-21.0.1_windows-x64_bin.zip', 'graalvm.zip') }" + powershell -Command "if (Test-Path('graalvm')) { return } else { (New-Object Net.WebClient).DownloadFile('https://download.oracle.com/graalvm/21/archive/graalvm-jdk-21.0.2_windows-x64_bin.zip', 'graalvm.zip') }" powershell -Command "if (Test-Path('graalvm')) { return } else { Expand-Archive graalvm.zip graalvm }" diff --git a/fs b/fs index 374c36a3..e22269c8 160000 --- a/fs +++ b/fs @@ -1 +1 @@ -Subproject commit 374c36a3f7316e7a445f47220719283947a97e14 +Subproject commit e22269c885d25962b673504f36db4ddf3b794b7f diff --git a/script/install-graalvm b/script/install-graalvm index 61062465..c1a2c7f4 100755 --- a/script/install-graalvm +++ b/script/install-graalvm @@ -4,7 +4,7 @@ set -euo pipefail INSTALL_DIR="${1:-$HOME}" -GRAALVM_VERSION="${GRAALVM_VERSION:-21.0.1}" +GRAALVM_VERSION="${GRAALVM_VERSION:-21.0.2}" GRAALVM_PLATFORM=$BABASHKA_PLATFORM