diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 74a8c4a6..1680a5ff 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,8 +10,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- - uses: actions/setup-java@v1
+ - uses: actions/setup-java@v2
with:
+ distribution: 'adopt'
java-version: ${{ matrix.java }}
- run: java -version
- uses: DeLaGuardo/setup-clojure@master
diff --git a/.gitignore b/.gitignore
index 702edb6e..70013353 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
/.cpcache/
.nrepl-port
/target
-.clj-kondo/.cache
+**/.clj-kondo/.cache
**/.lsp
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index 3251b66b..b84beb23 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -2,6 +2,17 @@ All notable changes to this project will be documented in this file. This change
== Unreleased (dev)
+== 0.13.0 (2021-04-15)
+// {{{
+=== Added
+* https://github.com/liquidz/antq/issues/71[#71]: Added support for https://book.babashka.org/index.html#_bb_edn[bb.edn].
+
+=== Changed
+* Bumped tools.deps.alpha to 0.11.910.
+* Bumped rewrite-clj to 1.0.605-alpha.
+* Bumped deps-deploy to the latest commit.
+// }}}
+
== 0.12.4 (2021-04-02)
// {{{
* Re-release 0.12.3 because it was deployed to clojars with wrong content.
diff --git a/README.adoc b/README.adoc
index ac2145fe..6aae2693 100644
--- a/README.adoc
+++ b/README.adoc
@@ -24,6 +24,7 @@ If you'd like to use with 1.7.0 or earlier, please see link:./doc/clojure-1.7.ad
* build.boot (https://boot-clj.com[Boot])
* pom.xml (https://maven.apache.org[Maven])
* .github/workflows/*.yml (https://github.com/features/actions[GitHub Actions])
+* bb.edn (https://book.babashka.org/index.html#_bb_edn[Babashka])
== Usage
diff --git a/deps.edn b/deps.edn
index 81abea0e..268a768c 100644
--- a/deps.edn
+++ b/deps.edn
@@ -4,11 +4,11 @@
org.clojure/data.xml {:mvn/version "0.2.0-alpha6"}
org.clojure/data.zip {:mvn/version "1.0.0"}
org.clojure/tools.cli {:mvn/version "1.0.206"}
- org.clojure/tools.deps.alpha {:mvn/version "0.11.905"}
+ org.clojure/tools.deps.alpha {:mvn/version "0.11.910"}
cheshire/cheshire {:mvn/version "5.10.0"}
clj-commons/clj-yaml {:mvn/version "0.7.106"}
version-clj/version-clj {:mvn/version "2.0.1"}
- rewrite-clj/rewrite-clj {:mvn/version "1.0.594-alpha"}}
+ rewrite-clj/rewrite-clj {:mvn/version "1.0.605-alpha"}}
:aliases
{:1.8
@@ -43,7 +43,7 @@
:deploy
{:extra-deps {slipset/deps-deploy {;:mvn/version "RELEASE"
:git/url "https://github.com/slipset/deps-deploy"
- :sha "49f1da003208d615d52c06164401e6fb3d9ba853"}}
+ :sha "b4359c5d67ca002d9ed0c4b41b710d7e5a82e3bf"}}
:exec-fn deps-deploy.deps-deploy/deploy
:exec-args {}}
diff --git a/pom.xml b/pom.xml
index 6c7f962d..874236f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.github.liquidz
antq
- 0.12.4
+ 0.13.0
antq
Point out your outdated dependencies
https://github.com/liquidz/antq
@@ -37,12 +37,12 @@
rewrite-clj
rewrite-clj
- 1.0.594-alpha
+ 1.0.605-alpha
org.clojure
tools.deps.alpha
- 0.11.905
+ 0.11.910
org.clojure
diff --git a/src/antq/core.clj b/src/antq/core.clj
index aa67a4eb..f5cb3367 100644
--- a/src/antq/core.clj
+++ b/src/antq/core.clj
@@ -8,6 +8,7 @@
(ns antq.core
(:gen-class)
(:require
+ [antq.dep.babashka :as dep.bb]
[antq.dep.boot :as dep.boot]
[antq.dep.clojure :as dep.clj]
[antq.dep.github-action :as dep.gh-action]
@@ -188,7 +189,8 @@
(when-not (skip "github-action") (dep.gh-action/load-deps %))
(when-not (skip "pom") (dep.pom/load-deps %))
(when-not (skip "shadow-cljs") (dep.shadow/load-deps %))
- (when-not (skip "leiningen") (dep.lein/load-deps %)))
+ (when-not (skip "leiningen") (dep.lein/load-deps %))
+ (when-not (skip "babashka") (dep.bb/load-deps %)))
(distinct (:directory options)))))
(defn mark-only-newest-version-flag
diff --git a/src/antq/dep/babashka.clj b/src/antq/dep/babashka.clj
new file mode 100644
index 00000000..d28374b8
--- /dev/null
+++ b/src/antq/dep/babashka.clj
@@ -0,0 +1,15 @@
+(ns antq.dep.babashka
+ (:require
+ [antq.dep.clojure :as dep.clj]
+ [antq.util.dep :as u.dep]
+ [clojure.java.io :as io]))
+
+(def ^:private project-file "bb.edn")
+
+(defn load-deps
+ ([] (load-deps "."))
+ ([dir]
+ (let [file (io/file dir project-file)]
+ (when (.exists file)
+ (dep.clj/extract-deps (u.dep/relative-path file)
+ (slurp file))))))
diff --git a/test/antq/dep/babashka_test.clj b/test/antq/dep/babashka_test.clj
new file mode 100644
index 00000000..a962d4e7
--- /dev/null
+++ b/test/antq/dep/babashka_test.clj
@@ -0,0 +1,13 @@
+(ns antq.dep.babashka-test
+ (:require
+ [antq.dep.babashka :as sut]
+ [antq.record :as r]
+ [clojure.test :as t]))
+
+(t/deftest load-deps-test
+ (t/is (= [(r/map->Dependency {:type :java
+ :file "test/resources/dep/bb.edn"
+ :name "bb/core"
+ :version "1.0.0"
+ :project :clojure})]
+ (sut/load-deps "test/resources/dep"))))
diff --git a/test/resources/dep/bb.edn b/test/resources/dep/bb.edn
new file mode 100644
index 00000000..d5dd04cc
--- /dev/null
+++ b/test/resources/dep/bb.edn
@@ -0,0 +1 @@
+{:deps {bb/core {:mvn/version "1.0.0"}}}