Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

0.7.4 #34

Merged
merged 5 commits into from
Oct 8, 2020
Merged

0.7.4 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f15a58e
Fix to ignore deps which has local/root opt #33
liquidz Oct 8, 2020
f77249f
Bump tools.deps.alpha to 0.9.816
liquidz Oct 8, 2020
f78caa1
Update changelog
liquidz Oct 8, 2020
d5d55f8
ver 0.7.4
liquidz Oct 8, 2020
913ff90
Fix format
liquidz Oct 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@ All notable changes to this project will be documented in this file. This change

== Unreleased (dev)

== 0.7.4 (2020-10-08)
// {{{
=== Changed
* Bumped tools.deps.alpha to `0.9.816`.

=== Fixed
* https://github.com/liquidz/antq/issues/33[#33]: Fixed to ignore Clojure CLI deps which has `local/root`.
// }}}

== 0.7.3 (2020-09-29)
// {{{
=== Added
Expand Down
2 changes: 1 addition & 1 deletion deps.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
:deps
{org.clojure/clojure {:mvn/version "1.10.1"}
org.clojure/tools.cli {:mvn/version "1.0.194"}
org.clojure/tools.deps.alpha {:mvn/version "0.9.810"}
org.clojure/tools.deps.alpha {:mvn/version "0.9.816"}
cheshire/cheshire {:mvn/version "5.10.0"}
clj-commons/clj-yaml {:mvn/version "0.7.2"}
version-clj/version-clj {:mvn/version "0.1.2"}}
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>antq</groupId>
<artifactId>antq</artifactId>
<version>0.7.3</version>
<version>0.7.4</version>
<name>antq</name>
<description>Point out your outdated dependencies</description>
<url>https://github.com/liquidz/antq</url>
Expand Down Expand Up @@ -32,7 +32,7 @@
<dependency>
<groupId>org.clojure</groupId>
<artifactId>tools.deps.alpha</artifactId>
<version>0.9.810</version>
<version>0.9.816</version>
</dependency>
<dependency>
<groupId>clj-commons</groupId>
Expand Down
7 changes: 6 additions & 1 deletion src/antq/dep/clojure.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@

(def ^:private project-file "deps.edn")

(defn- ignore?
[opt]
(contains? opt :local/root))

(defmulti extract-type-and-version
(fn [opt]
(or (and (:mvn/version opt) :java)
Expand All @@ -34,7 +38,8 @@
(swap! deps merge (second form)))
form)
edn)
(for [[dep-name opt] @deps]
(for [[dep-name opt] @deps
:when (not (ignore? opt))]
(-> {:file project-file
:name (if (qualified-symbol? dep-name)
(str dep-name)
Expand Down
4 changes: 3 additions & 1 deletion test/resources/dep/deps.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{:deps {foo/core {:mvn/version "1.0.0"}
bar {:mvn/version "2.0.0"}
git/hello {:git/url "https://github.com/example/hello.git"
:sha "dummy-sha"}}
:sha "dummy-sha"}
;; local/root should be ignored
local-repo/local-repo {:local/root "/path/to/local/repo"}}

:aliases
{:foo {:extra-deps {baz {:mvn/version "3.0.0"}}}}
Expand Down