Skip to content

Commit

Permalink
fix duplicate third-party library dir and add new namespaces to sci ctx.
Browse files Browse the repository at this point in the history
  • Loading branch information
phronmophobic committed Sep 13, 2024
1 parent a158044 commit 7a9c46f
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
[submodule "examples/snake"]
path = examples/snake
url = https://github.com/phronmophobic/programming-clojure.git
[submodule "third-party/babashka"]
path = third-party/babashka
[submodule "third_party/babashka"]
path = third_party/babashka
url = https://github.com/babashka/babashka.git
5 changes: 3 additions & 2 deletions deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
org.clojure/data.json {:mvn/version "2.5.0"}
slipset/deps-deploy {:mvn/version "RELEASE"}}
:ns-default build}
:membrane {:extra-paths ["third-party/babashka/feature-httpkit-client/"]
:membrane {:extra-paths ["third_party/babashka/feature-httpkit-client/"
"third_party/babashka/feature-httpkit-server/"]
:extra-deps
{com.phronemophobic/membrane {;; :mvn/version "0.15.0-beta-SNAPSHOT"
:local/root "../membrane"
Expand All @@ -49,7 +50,7 @@
babashka/fs {:mvn/version "0.5.22"}
mogenslund/liquid {:mvn/version "2.0.3"}

http-kit/http-kit {:mvn/version "2.5.3"}
http-kit/http-kit {:mvn/version "2.8.0"}

com.phronemophobic/objcjure {:local/root "../objcjure"
;;:git/url "https://github.com/phronmophobic/objcjure.git"
Expand Down
7 changes: 4 additions & 3 deletions src/com/phronemophobic/grease/membrane.clj
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
(:require ;;babashka.impl.async
;;babashka.impl.hiccup
babashka.impl.httpkit-client
;;babashka.impl.httpkit-server
babashka.impl.httpkit-server
)
(:import java.net.NetworkInterface
java.net.URL
Expand Down Expand Up @@ -106,15 +106,16 @@
:ns sci-ns-var))))
(scify/ns->ns-map 'tech.v3.datatype.ffi)
(scify/ns->ns-map 'com.phronemophobic.clj-libffi)
(scify/ns->ns-map 'com.phronemophobic.clj-libffi.callback)
(scify/ns->ns-map 'babashka.fs)

;; extras
{ ;; 'clojure.core.async babashka.impl.async/async-namespace
;; 'clojure.core.async.impl.protocols babashka.impl.async/async-protocols-namespace

'org.httpkit.client babashka.impl.httpkit-client/httpkit-client-namespace
;; 'org.httpkit.sni-client babashka.impl.httpkit-client/sni-client-namespace
;; 'org.httpkit.server babashka.impl.httpkit-server/httpkit-server-namespace
'org.httpkit.sni-client babashka.impl.httpkit-client/sni-client-namespace
'org.httpkit.server babashka.impl.httpkit-server/httpkit-server-namespace

;; 'hiccup.core babashka.impl.hiccup/hiccup-namespace
;; 'hiccup2.core babashka.impl.hiccup/hiccup2-namespace
Expand Down
1 change: 0 additions & 1 deletion third-party/babashka
Submodule babashka deleted from ca26b2
1 change: 1 addition & 0 deletions third_party/babashka
Submodule babashka added at 0c6f8b

0 comments on commit 7a9c46f

Please sign in to comment.