diff --git a/deps.edn b/deps.edn index f976213..d556943 100644 --- a/deps.edn +++ b/deps.edn @@ -4,7 +4,8 @@ org.clojure/tools.deps {:mvn/version "0.16.1264"} org.slf4j/slf4j-jdk14 {:mvn/version "1.7.9"} javax.xml.bind/jaxb-api {:mvn/version "2.3.1"} - nrepl/bencode {:mvn/version "1.1.0"}} + nrepl/bencode {:mvn/version "1.1.0"} + babashka/fs {:mvn/version "0.4.19"}} :paths ["src" "resources"] :aliases {:compile-main {:main-opts ["-e" "(compile 'borkdude.tdn.main)"] diff --git a/reflect-config-cleaned.json b/reflect-config-cleaned.json index 9a50c17..b5b0bd3 100644 --- a/reflect-config-cleaned.json +++ b/reflect-config-cleaned.json @@ -12,6 +12,8 @@ "name" : "[J" }, { "name" : "[Ljava.lang.Object;" +}, { + "name" : "[Ljava.nio.file.LinkOption;" }, { "name" : "[S" }, { diff --git a/script/test.clj b/script/test.clj index edceae7..fce025a 100644 --- a/script/test.clj +++ b/script/test.clj @@ -23,6 +23,6 @@ (shell native-executable "create-basis" '{:extra {:deps {buddy/buddy-core {:mvn/version "1.10.1"}}}}) -(shell native-executable "create-basis" (edn/read-string (slurp "test/bbuild-issue-10-deps.edn"))) +(shell native-executable "create-basis" (str (fs/file "test" "bbuild-issue-10-deps.edn"))) nil diff --git a/src/borkdude/tdn/cli.clj b/src/borkdude/tdn/cli.clj index c91c1b6..06859e4 100644 --- a/src/borkdude/tdn/cli.clj +++ b/src/borkdude/tdn/cli.clj @@ -2,7 +2,8 @@ (:require [clojure.edn :as edn] [clojure.java.io :as io] - [clojure.tools.deps :as deps])) + [clojure.tools.deps :as deps] + [babashka.fs :as fs])) (def default-repos {"central" {:url "https://repo1.maven.org/maven2/"} @@ -75,6 +76,7 @@ Use tools-deps.edn help to get more specific help")) (defn create-basis [args] (let [arg (first args) + arg (if (fs/exists? arg) (slurp arg) arg) deps (edn/read-string arg)] (if (map? deps) (prn (-> deps @@ -83,7 +85,7 @@ Use tools-deps.edn help to get more specific help")) deps/create-basis)) (binding [*out* *err*] (throw - (ex-info (str"Invalid argument " deps ", expeccted a map") {})))))) + (ex-info (str"Invalid argument " deps ", expected a map") {})))))) (defn deps [args] (let [arg (first args)