From d854de883e3e7f773c9fc657cd7e62de0b894984 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Wed, 11 Oct 2023 16:19:06 +0200 Subject: [PATCH] Bump http-kit (#1634) --- .circleci/script/gen_ci.clj | 6 +++--- .cirrus.yml | 4 ++-- CHANGELOG.md | 2 ++ appveyor.yml | 4 +--- deps.edn | 2 +- project.clj | 4 ++-- resources/META-INF/babashka/deps.edn | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.circleci/script/gen_ci.clj b/.circleci/script/gen_ci.clj index 5ba9ce5e..0b62d382 100644 --- a/.circleci/script/gen_ci.clj +++ b/.circleci/script/gen_ci.clj @@ -170,10 +170,10 @@ java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$refl (str base-install-cmd "\nsudo -E script/setup-musl") base-install-cmd))) (run "Download GraalVM" "script/install-graalvm") - (run "Download iprof" "curl -sLO 'https://github.com/babashka/pgo-profiles/releases/download/2023.09.27/default.iprof'") + #_(run "Download iprof" "curl -sLO 'https://github.com/babashka/pgo-profiles/releases/download/2023.10.11/default.iprof'") (run "Build binary" (if (= "aarch64" arch) - "script/uberjar\nscript/compile -H:PageSize=64K --pgo=default.iprof" - "script/uberjar\nscript/compile --pgo=default.iprof") "30m") + "script/uberjar\nscript/compile -H:PageSize=64K # --pgo=default.iprof" + "script/uberjar\nscript/compile # --pgo=default.iprof") "30m") (run "Run tests" "script/test\nscript/run_lib_tests") (run "Release" ".circleci/script/release") {:persist_to_workspace {:root "/tmp" diff --git a/.cirrus.yml b/.cirrus.yml index 4fb8ebc4..2e3e5054 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -25,8 +25,8 @@ task: java -version script/uberjar - curl -sLO 'https://github.com/babashka/pgo-profiles/releases/download/2023.09.27/default.iprof' - script/compile --pgo=default.iprof + # curl -sLO 'https://github.com/babashka/pgo-profiles/releases/download/2023.10.11/default.iprof' + script/compile # --pgo=default.iprof # script/test # script/run_lib_tests diff --git a/CHANGELOG.md b/CHANGELOG.md index 42020a29..e6600d8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ A preview of the next release can be installed from - Add `java.security.KeyFactory`, `java.security.spec.PKCS8EncodedKeySpec` - Fix babashka.process/exec wrt `babashka.process/*defaults*` - #1632: Partial fix for `(.readPassword (System/console))` +- Enable producing self-contained binaries using [uberjars](https://github.com/babashka/babashka/wiki/Self-contained-executable#uberjar) +- Bump httpkit to `2.8.0-beta3` (fixes GraalVM issue with virtual threads) ## 1.3.185 (2023-09-28) diff --git a/appveyor.yml b/appveyor.yml index be3a9918..49a27c2f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,8 +41,6 @@ build_script: - cmd: >- powershell -Command "if (Test-Path('graalvm')) { return } else { (New-Object Net.WebClient).DownloadFile('https://download.oracle.com/graalvm/21/archive/graalvm-jdk-21_windows-x64_bin.zip', 'graalvm.zip') }" - powershell -Command "if (Test-Path('iprof.default')) { return } else { (New-Object Net.WebClient).DownloadFile('https://github.com/babashka/pgo-profiles/releases/download/2023.09.27/default.iprof', 'default.iprof') }" - powershell -Command "if (Test-Path('graalvm')) { return } else { Expand-Archive graalvm.zip graalvm }" - cmd: >- @@ -60,7 +58,7 @@ build_script: - cmd: >- call script/uberjar.bat - call script/compile.bat --pgo=default.iprof + call script/compile.bat echo Creating zip archive diff --git a/deps.edn b/deps.edn index b30c02ad..c05d160d 100644 --- a/deps.edn +++ b/deps.edn @@ -39,7 +39,7 @@ org.postgresql/postgresql {:mvn/version "42.2.18"} org.hsqldb/hsqldb {:mvn/version "2.5.1"} datascript/datascript {:mvn/version "1.0.1"} - http-kit/http-kit {:mvn/version "2.7.0-RC1"} + http-kit/http-kit {:mvn/version "2.8.0-beta3"} babashka/clojure-lanterna {:mvn/version "0.9.8-SNAPSHOT"} org.clojure/core.match {:mvn/version "1.0.0"} hiccup/hiccup {:mvn/version "2.0.0-RC1"} diff --git a/project.clj b/project.clj index 13506fc9..a96f4fe6 100644 --- a/project.clj +++ b/project.clj @@ -60,9 +60,9 @@ :feature/datascript {:source-paths ["feature-datascript"] :dependencies [[datascript "1.3.10"]]} :feature/httpkit-client {:source-paths ["feature-httpkit-client"] - :dependencies [[http-kit "2.7.0-RC1"]]} + :dependencies [[http-kit "2.8.0-beta3"]]} :feature/httpkit-server {:source-paths ["feature-httpkit-server"] - :dependencies [[http-kit "2.7.0-RC1"]]} + :dependencies [[http-kit "2.8.0-beta3"]]} :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/resources/META-INF/babashka/deps.edn b/resources/META-INF/babashka/deps.edn index b30c02ad..c05d160d 100644 --- a/resources/META-INF/babashka/deps.edn +++ b/resources/META-INF/babashka/deps.edn @@ -39,7 +39,7 @@ org.postgresql/postgresql {:mvn/version "42.2.18"} org.hsqldb/hsqldb {:mvn/version "2.5.1"} datascript/datascript {:mvn/version "1.0.1"} - http-kit/http-kit {:mvn/version "2.7.0-RC1"} + http-kit/http-kit {:mvn/version "2.8.0-beta3"} babashka/clojure-lanterna {:mvn/version "0.9.8-SNAPSHOT"} org.clojure/core.match {:mvn/version "1.0.0"} hiccup/hiccup {:mvn/version "2.0.0-RC1"}