From ecb0fa5cac0a24ce3a03cdb04279fde327c5eb50 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Thu, 12 Sep 2024 16:48:00 +0200 Subject: [PATCH] Fix #1716: expose babashka.http-client.interceptors namespace --- CHANGELOG.md | 5 +++-- src/babashka/impl/http_client.clj | 4 ++++ src/babashka/main.clj | 9 ++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6c5d0ee..29dfebdd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,10 +10,11 @@ A preview of the next release can be installed from ## Unreleased - Upgrade Clojure to `1.12.0` -- Fix [#1722](https://github.com/babashka/babashka/issues/1722): add new clojure 1.12 vars +- [#1722](https://github.com/babashka/babashka/issues/1722): add new clojure 1.12 vars - [#1720](https://github.com/babashka/babashka/issues/1720): Include new clojure 1.12's `clojure.java.process` - [#1719](https://github.com/babashka/babashka/issues/1719): add new clojure 1.12 `clojure.repl.deps` namespace. Only calls with explicit versions are supported. -- [#1598](https://github.com/babashka/babashka/issues/1598): use Rosetta on CircleCI to build x64 images +- [#1598](https://github.com/babashka/babashka/issues/1598): use Rosetta on CircleCI to build x64 images +- [#1716](https://github.com/babashka/babashka/issues/1716): expose `babashka.http-client.interceptors` namespace - Bump SCI - Bump `fs` - Bump `process` diff --git a/src/babashka/impl/http_client.clj b/src/babashka/impl/http_client.clj index c07ccfe7..638faf23 100644 --- a/src/babashka/impl/http_client.clj +++ b/src/babashka/impl/http_client.clj @@ -1,11 +1,13 @@ (ns babashka.impl.http-client (:require [babashka.http-client] + [babashka.http-client.interceptors] [babashka.http-client.websocket] [sci.core :as sci])) (def hns (sci/create-ns 'babashka.http-client)) (def wns (sci/create-ns 'babashka.http-client.websocket)) +(def ins (sci/create-ns 'babashka.http-client.interceptors)) (def http-client-namespace (sci/copy-ns babashka.http-client hns)) @@ -13,3 +15,5 @@ (def http-client-websocket-namespace (sci/copy-ns babashka.http-client.websocket wns)) +(def http-client-interceptors-namespace + (sci/copy-ns babashka.http-client.interceptors ins)) diff --git a/src/babashka/main.clj b/src/babashka/main.clj index 1b15e139..995da29d 100644 --- a/src/babashka/main.clj +++ b/src/babashka/main.clj @@ -16,6 +16,7 @@ [babashka.impl.clojure.instant :as instant] [babashka.impl.clojure.java.browse :refer [browse-namespace]] [babashka.impl.clojure.java.io :refer [io-namespace]] + [babashka.impl.clojure.java.process :refer [cjp-namespace]] [babashka.impl.clojure.java.shell :refer [shell-namespace]] [babashka.impl.clojure.main :as clojure-main :refer [demunge]] [babashka.impl.clojure.math :refer [math-namespace]] @@ -25,7 +26,6 @@ [babashka.impl.clojure.tools.reader-types :refer [edn-namespace reader-types-namespace]] [babashka.impl.clojure.zip :refer [zip-namespace]] - [babashka.impl.clojure.java.process :refer [cjp-namespace]] [babashka.impl.common :as common] [babashka.impl.core :as bbcore] [babashka.impl.curl :refer [curl-namespace]] @@ -36,7 +36,9 @@ [babashka.impl.error-handler :refer [error-handler]] [babashka.impl.features :as features] [babashka.impl.fs :refer [fs-namespace]] - [babashka.impl.http-client :refer [http-client-namespace http-client-websocket-namespace]] + [babashka.impl.http-client :refer [http-client-namespace + http-client-websocket-namespace + http-client-interceptors-namespace]] [babashka.impl.nrepl-server :refer [nrepl-server-namespace]] [babashka.impl.pods :as pods] [babashka.impl.pprint :refer [pprint-namespace]] @@ -424,7 +426,8 @@ Use bb run --help to show this help output. 'sci.core sci-core-namespace 'babashka.cli cli/cli-namespace 'babashka.http-client http-client-namespace - 'babashka.http-client.websocket http-client-websocket-namespace} + 'babashka.http-client.websocket http-client-websocket-namespace + 'babashka.http-client.interceptors http-client-interceptors-namespace} features/xml? (assoc 'clojure.data.xml @(resolve 'babashka.impl.xml/xml-namespace) 'clojure.data.xml.event @(resolve 'babashka.impl.xml/xml-event-namespace) 'clojure.data.xml.tree @(resolve 'babashka.impl.xml/xml-tree-namespace))