Merge branch 'release/1.4.0'

.gitignore

@@ -12,6 +12,8 @@
 /docs/_build/
 /.nrepl-history
 /test-data/
+/test/resources/data/grill/
+/test/resources/test-data/
 /buildutils/boot
 /*.dscard
 /*.dsrepo
@@ -26,6 +28,7 @@ pom.xml.asc
 .hgignore
 .hg/
 /.ve/
+foo.edn
 
 *.zip
 cmake/

TODO

@@ -1,3 +1,9 @@
-- [ ] add tests to grill for different repo merge strategies for both resolve-locations and query-repo
+- [ ] Add docs URL to help page.
+- [ ] Term hoisting tests both for found packages and present packages
+- [ ] Add test for validation checking of present packages in config files
+- [ ] Do something about `:any` in APT pkgsystem
+- [ ] Docs for `--present-package`
+- [ ] Docs for `--package-system`
 - [ ] Add tree returned value when `fast` is used.
-- [ ] Add option to print said tree when fast is used.
+- [ ] Add option to print said tree when fast is used.
+- [ ] package systems for query repo.

apt-depends-strings

@@ -0,0 +1 @@
+bash-completion (<< 20060301-0), bash-doc (<= 2.05-1),base-files (>= 2.1.12), debianutils (>= 2.15), dash (>= 0.5.5.1-2.2), libc6 (>= 2.15), libtinfo5 (>= 6), bash-completion (>= 20060301-0)

project.clj

@@ -1,15 +1,16 @@
-(defproject degasolv/degasolv "1.3.0"
+(defproject degasolv/degasolv "1.4.0"
   :description "Dependency tracker with an eye toward building and shipping software."
   :url "http://github.com/djhaskin987/degasolv"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :main degasolv.cli
   :dependencies [
                  [org.clojure/clojure "1.9.0-alpha14"]
-                 [version-clj "0.1.2"]
+                 [serovers "1.1.0"]
                  [org.clojure/tools.cli "0.3.5"]
                  [me.raynes/fs "1.4.6"]
                  [com.velisco/tagged "0.5.0"]
+                 [tupelo "0.9.31"]
                  ]
   :plugins [[lein-print "0.1.0"]]
   :test-selectors
@@ -22,10 +23,16 @@
    }
   :profiles {
              :dev {:dependencies [
-                                  [org.clojure/core.match "0.3.0-alpha4"]
-                                  [version-clj "0.1.2"
+                                  [tupelo "0.9.31"]
+                                  [serovers "1.1.0"
                                    :exclusions [org.clojure/clojure]]
                                   ]}
-             :uberjar {:aot [degasolv.cli degasolv.resolver]}
+             :uberjar {:aot [
+                             degasolv.pkgsys.core
+                             degasolv.pkgsys.apt
+                             degasolv.util
+                             degasolv.resolver
+                             degasolv.cli
+                             ]}
              }
   :target-path "target/%s")