Merge pull request #105 from jonase/upgrade-deps

Update dependencies

project.clj

@@ -6,8 +6,8 @@
             :distribution :repo
             :comments "Contact if any questions"}
   :dependencies [[org.clojure/clojure "1.6.0"]
-                 [org.clojure/core.logic "0.8.0-rc2"]
-                 [org.clojure/tools.cli "0.2.2"]]
-  :profiles {:dev {:dependencies [[lein-marginalia "0.7.0"]]
+                 [org.clojure/core.logic "0.8.9"]
+                 [org.clojure/tools.cli "0.3.1"]]
+  :profiles {:dev {:dependencies [[lein-marginalia "0.8.0"]]
                    :resource-paths ["test/resources"]}}
   :warn-on-reflection false)

src/kibit/check.clj

@@ -1,7 +1,7 @@
 (ns kibit.check
   "Kibit's integration point and public API"
   (:require [clojure.java.io :as io]
-            [clojure.core.logic :as logic]
+            [clojure.core.logic.unifier :as unifier]
             [kibit.core :as core]
             [kibit.rules :as core-rules]
             [kibit.reporters :as reporters])
@@ -28,7 +28,7 @@
 ;; where necessary.
 ;;
 ;; For more information, see: [rules](#kibit.rules) namespace
-(def all-rules (map logic/prep core-rules/all-rules))
+(def all-rules (map unifier/prep core-rules/all-rules))
 
 ;; Reading source files
 ;; --------------------

src/kibit/rules/util.clj

@@ -1,8 +1,9 @@
 (ns kibit.rules.util
-  (:require [clojure.core.logic :as logic]))
+  (:require [clojure.core.logic :as logic]
+            [clojure.core.logic.unifier :as unifier]))
 
 (defn compile-rule [rule]
-  (let [[pat alt] (logic/prep rule)]
+  (let [[pat alt] (unifier/prep rule)]
      [(fn [expr] (logic/== expr pat))
       (fn [sbst] (logic/== sbst alt))]))
 

test/kibit/test/core.clj

@@ -1,11 +1,11 @@
 (ns kibit.test.core
   (:require [kibit.check :as kibit]
             [kibit.core :as core]
-            [clojure.core.logic :as logic]
+            [clojure.core.logic.unifier :as unifier]
             [kibit.rules :as core-rules])
   (:use [clojure.test]))
 
-(def all-rules  (map logic/prep core-rules/all-rules))
+(def all-rules  (map unifier/prep core-rules/all-rules))
 
 (deftest simplify-alts
   (are [expected-alt test-expr]