Use org.babashka/tools-deps-native via registry

polyfy · Jun 22, 2023 · 0cf1cb6 · 0cf1cb6
1 parent e57f0d0
commit 0cf1cb6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/projects/poly-bb/bb.edn b/projects/poly-bb/bb.edn
@@ -1,2 +1 @@
-{;:paths ["bb"]
- :deps {polylith/polith {:local/root "."}}}
+{:deps {polylith/polith {:local/root "."}}}
diff --git a/projects/poly-bb/deps.edn b/projects/poly-bb/deps.edn
@@ -1,6 +1,6 @@
 {:paths ["src"]
  :deps {
-        ;poly/antq                     {:local/root "../../components/antq"}
+        poly/antq                     {:local/root "../../components/antq"}
         poly/change                   {:local/root "../../components/change"}
         poly/clojure-test-test-runner {:local/root "../../components/clojure-test-test-runner"}
         poly/command                  {:local/root "../../components/command"}
@@ -11,7 +11,7 @@
         poly/file                     {:local/root "../../components/file"}
         poly/git                      {:local/root "../../components/git"}
         poly/help                     {:local/root "../../components/help"}
-        ;poly/lib                      {:local/root "../../components/lib"}
+        poly/lib                      {:local/root "../../components/lib"}
         poly/migrator                 {:local/root "../../components/migrator"}
         poly/path-finder              {:local/root "../../components/path-finder"}
         poly/sh                       {:local/root "../../components/sh"}
@@ -32,10 +32,7 @@
         poly/poly-cli                 {:local/root "../../bases/poly-cli"}
 
         org.clojure/clojure {:mvn/version "1.11.1"}
-        org.slf4j/slf4j-nop {:mvn/version "2.0.7"}
-
-        org.clojure/tools.deps {:git/url "https://github.com/babashka/tools-deps-native.git" :sha "d1d80492ecb47d34820b8237431396e51d3dde5f"}
-
+        org.slf4j/slf4j-nop {:mvn/version "2.0.7"}      
       }
 
  ;; so poly can be installed as a tool:

diff --git a/projects/poly-bb/src/polylith_bb/core.clj b/projects/poly-bb/src/polylith_bb/core.clj
@@ -3,10 +3,7 @@
 ;; Hack 1: Load tools.deps pod instead of library
 
 (require '[babashka.pods :as pods])
-
-(let [pod-binary (-> (clojure.java.io/file *file*) .getParentFile .getParentFile .getParentFile (clojure.java.io/file "tools-deps-native") .getAbsolutePath)]
-  ;; FIXME fetch pod in some other way
-  (pods/load-pod pod-binary))
+(pods/load-pod 'org.babashka/tools-deps-native "0.1.0")
 
 ;; Hack 2: add clojure.tools.reader/resolve-symbol
 

diff --git a/projects/poly-bb/tools-deps-native b/projects/poly-bb/tools-deps-native