diff --git a/.gitmodules b/.gitmodules index 3bc4803..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "bin/hooks"] - path = bin/hooks - url = git@github.com:arrdem/git-flow-hooks.git diff --git a/bin/hooks b/bin/hooks deleted file mode 160000 index c7cd4f5..0000000 --- a/bin/hooks +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c7cd4f50871b20a580a66e77a34bfa9d336fe430 diff --git a/bin/install-hooks.sh b/bin/install-hooks.sh deleted file mode 100644 index f3acf21..0000000 --- a/bin/install-hooks.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -rm -r ./.git/hooks -ln -s ../bin/hooks .git/hooks diff --git a/deps.edn b/deps.edn new file mode 100644 index 0000000..ab8e0ce --- /dev/null +++ b/deps.edn @@ -0,0 +1,6 @@ +{:paths ["src"] + :deps {org.clojure/clojure {:mvn/version "1.9.0"} + me.arrdem/guten-tag {:mvn/version "0.1.6" :exclusions [org.clojure/clojure]} + version-clj {:mvn/version "0.1.2"} + org.clojure/core.match {:mvn/version "0.3.0-alpha4" :exclusions [org.clojure/clojure]} + com.cemerick/url {:mvn/version "0.1.1" :exclusions [com.cemerick/clojurescript.test org.clojure/clojure]}}} diff --git a/project.clj b/project.clj index ee5c5ad..f60a2b7 100644 --- a/project.clj +++ b/project.clj @@ -9,6 +9,7 @@ :dependencies [[org.clojure/clojure "1.9.0"] [me.arrdem/guten-tag "0.1.6" :exclusions [org.clojure/clojure]] + [version-clj "0.1.2"] [org.clojure/core.match "0.3.0-alpha4" :exclusions [org.clojure/clojure]] [com.cemerick/url "0.1.1" diff --git a/src/grimoire/api/fs/read.clj b/src/grimoire/api/fs/read.clj index c7728c8..640a19f 100644 --- a/src/grimoire/api/fs/read.clj +++ b/src/grimoire/api/fs/read.clj @@ -10,7 +10,8 @@ [grimoire.api.fs.impl :as impl] [clojure.java.io :as io] [clojure.string :as string] - [cemerick.url :as url]) + [cemerick.url :as url] + [version-clj.core :as v]) (:import [java.io File])) (defn- f->name [^File f] @@ -52,7 +53,7 @@ (->> (for [d (reverse (sort (.listFiles handle))) :when (.isDirectory d)] (t/->Version artifact (f->name d))) - (sort-by (comp util/clojure-version->cmp-key t/thing->name)) + (sort-by t/thing->name v/version-compare) reverse succeed) (fail (str "No such artifact "