From bc5e6b6d522fc95d1e9a3eb0272214742508acd0 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Mon, 25 Sep 2023 14:52:26 +0200 Subject: [PATCH] Add interop on java.util.stream.IntStream (#1625) --- CHANGELOG.md | 1 + resources/META-INF/babashka/deps.edn | 4 ++-- src/babashka/impl/classes.clj | 3 +++ test/babashka/interop_test.clj | 3 +++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6763c8b..7d1d2122 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ A preview of the next release can be installed from - Bump babashka.http-client to v0.4.15 - Bump rewrite-clj to v0.1.1.47 - [#1619](https://github.com/babashka/babashka/issues/1619): Fix reflection issue with `Thread/sleep` in `core.async/timeout` +- Support interop on `java.util.stream.IntStream` ## 1.3.184 (2023-08-22) diff --git a/resources/META-INF/babashka/deps.edn b/resources/META-INF/babashka/deps.edn index 7ea1bfb4..07de537c 100644 --- a/resources/META-INF/babashka/deps.edn +++ b/resources/META-INF/babashka/deps.edn @@ -29,7 +29,7 @@ org.clojure/core.async {:mvn/version "1.6.673"}, org.clojure/tools.cli {:mvn/version "1.0.214"}, org.clojure/data.csv {:mvn/version "1.0.0"}, - cheshire/cheshire {:mvn/version "5.11.0"} + cheshire/cheshire {:mvn/version "5.12.0"} org.clojure/data.xml {:mvn/version "0.2.0-alpha8"} clj-commons/clj-yaml {:mvn/version "1.0.27"} com.cognitect/transit-clj {:mvn/version "1.0.333"} @@ -43,7 +43,7 @@ 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"} - rewrite-clj/rewrite-clj {:mvn/version "1.1.46"} + rewrite-clj/rewrite-clj {:mvn/version "1.1.47"} selmer/selmer {:mvn/version "1.12.59"} com.taoensso/timbre {:mvn/version "6.0.1"} org.clojure/tools.logging {:mvn/version "1.1.0"} diff --git a/src/babashka/impl/classes.clj b/src/babashka/impl/classes.clj index a9d63247..adfdad47 100644 --- a/src/babashka/impl/classes.clj +++ b/src/babashka/impl/classes.clj @@ -481,6 +481,7 @@ java.util.jar.Manifest java.util.stream.BaseStream java.util.stream.Stream + java.util.stream.IntStream java.util.Random java.util.regex.Matcher java.util.regex.Pattern @@ -666,6 +667,8 @@ java.nio.file.FileSystem (instance? java.nio.file.PathMatcher v) java.nio.file.PathMatcher + (instance? java.util.stream.IntStream v) + java.util.stream.IntStream (instance? java.util.stream.BaseStream v) java.util.stream.BaseStream (instance? java.nio.ByteBuffer v) diff --git a/test/babashka/interop_test.clj b/test/babashka/interop_test.clj index c32b875a..9589d4df 100644 --- a/test/babashka/interop_test.clj +++ b/test/babashka/interop_test.clj @@ -41,3 +41,6 @@ (def cert (x509-certificate (io/file \"test-resources/certificate.crt\"))) (some? (.getSubjectX500Principal cert)) ")))) + +(deftest IntStream-test + (is (= 5 (bb nil "(.count (.codePoints \"woof🐕\"))"))))