From a4ceebe20904f310333dd39e0d6cccefc30ef8b2 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Sun, 31 Jan 2021 20:54:08 +0100 Subject: [PATCH] fs --- deps.edn | 7 ++++--- project.clj | 6 +++--- src/babashka/main.clj | 4 +++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/deps.edn b/deps.edn index 8d4741a0..a23d0429 100644 --- a/deps.edn +++ b/deps.edn @@ -12,7 +12,7 @@ "depstar/src" "process/src" "deps.clj/src" "deps.clj/resources" "resources" "sci/resources"], - :deps {org.clojure/clojure {:mvn/version "1.10.2-alpha2"}, + :deps {org.clojure/clojure {:mvn/version "1.10.2"}, borkdude/sci {:local/root "sci"} borkdude/graal.locking {:mvn/version "0.0.2"}, org.clojure/core.async {:mvn/version "1.3.610"}, @@ -32,7 +32,9 @@ babashka/clojure-lanterna {:mvn/version "0.9.8-SNAPSHOT"} org.clojure/math.combinatorics {:mvn/version "0.1.6"} org.clojure/core.match {:mvn/version "1.0.0"} - hiccup/hiccup {:mvn/version "2.0.0-alpha2"}} + hiccup/hiccup {:mvn/version "2.0.0-alpha2"} + babashka/fs {:local/root "fs"} + babashka/curl {:local/root "babashka.curl"}} :aliases {:main {:main-opts ["-m" "babashka.main"]} :profile @@ -52,7 +54,6 @@ :sha "f902d2c43121f9e1c48603d6eb99f5900eb6a9f6"} weavejester/medley {:git/url "https://github.com/weavejester/medley" :sha "a4e5fb5383f5c0d83cb2d005181a35b76d8a136d"} - babashka/babasha.curl {:local/root "babashka.curl"} cprop/cprop {:mvn/version "0.1.16"} comb/comb {:mvn/version "0.1.1"} mvxcvi/arrangement {:mvn/version "1.2.0"} diff --git a/project.clj b/project.clj index 61fe0263..2e18af88 100644 --- a/project.clj +++ b/project.clj @@ -8,13 +8,13 @@ :license {:name "Eclipse Public License 1.0" :url "http://opensource.org/licenses/eclipse-1.0.php"} :source-paths ["src" "sci/src" "babashka.curl/src" "pods/src" - "babashka.nrepl/src" "depstar/src" "process/src" - "deps.clj/src" "deps.clj/resources"] + "fs/src" "babashka.nrepl/src" "depstar/src" + "process/src" "deps.clj/src" "deps.clj/resources"] ;; for debugging Reflector.java code: ;; :java-source-paths ["sci/reflector/src-java"] :java-source-paths ["src-java"] :resource-paths ["resources" "sci/resources"] - :dependencies [[org.clojure/clojure "1.10.2-alpha2"] + :dependencies [[org.clojure/clojure "1.10.2"] [borkdude/edamame "0.0.11-alpha.28"] [borkdude/graal.locking "0.0.2"] [org.clojure/tools.cli "1.0.194"] diff --git a/src/babashka/main.clj b/src/babashka/main.clj index 8fc9aa5e..f39736cd 100644 --- a/src/babashka/main.clj +++ b/src/babashka/main.clj @@ -21,6 +21,7 @@ [babashka.impl.deps :as deps :refer [deps-namespace]] [babashka.impl.error-handler :refer [error-handler]] [babashka.impl.features :as features] + [babashka.impl.fs :refer [fs-namespace]] [babashka.impl.pods :as pods] [babashka.impl.pprint :refer [pprint-namespace]] [babashka.impl.process :refer [process-namespace]] @@ -382,7 +383,8 @@ Use -- to separate script command line args from bb command line args. 'clojure.core.protocols protocols-namespace 'babashka.process process-namespace 'clojure.core.server clojure-core-server - 'babashka.deps deps-namespace} + 'babashka.deps deps-namespace + 'babashka.fs fs-namespace} features/xml? (assoc 'clojure.data.xml @(resolve 'babashka.impl.xml/xml-namespace)) features/yaml? (assoc 'clj-yaml.core @(resolve 'babashka.impl.yaml/yaml-namespace) 'flatland.ordered.map @(resolve 'babashka.impl.ordered/ordered-map-ns))