Bump leiningen-core to 2.8.3

Author: cichli

Makefile

@@ -34,7 +34,6 @@ cljfmt:
 cloverage:
 	lein with-profile +$(CLOJURE_VERSION),+test-clj,+cloverage cloverage --codecov \
 	     -e ".*java.parser" \
-	     -e "cider-nrepl.plugin" \
 	     -e ".*util.instrument" \
 	     -t "^((?!debug-integration-test).)*$$"
 

project.clj

@@ -82,7 +82,7 @@
                                                      cider.nrepl/wrap-undef
                                                      cider.nrepl/wrap-version]}
                    :dependencies [;; For developing the Leiningen plugin.
-                                  [leiningen-core "2.8.2"]
+                                  [leiningen-core "2.8.3"]
                                   ;; For the boot tasks namespace
                                   [boot/base "2.8.2"]
                                   [boot/core "2.8.2"]]}

src/cider_nrepl/plugin.clj

@@ -2,26 +2,17 @@
   "Provides a simple way to setup the CIDER nREPL middleware in
   Leiningen projects."
   (:require
+   [cider.nrepl.version :refer [version-string]]
    [clojure.java.io :as io]
    [leiningen.core.main :as lein]))
 
-;; Keep in sync with the version in project.clj
-(defn- version
-  []
-  (let [v (-> (io/resource "cider/cider-nrepl/project.clj")
-              slurp
-              read-string
-              (nth 2))]
-    (assert (string? v)
-            (str "Something went wrong, version is not a string: "
-                 v))
-    v))
+(def min-lein-version "2.8.2")
 
 ;; Exists for the sole purpose of modifying the current project's metadata.
 ;; See https://github.com/technomancy/leiningen/blob/master/doc/PLUGINS.md#project-middleware
 (defn middleware
   [{:keys [dependencies exclusions] :as project}]
-  (let [lein-version-ok?    (lein/version-satisfies? (lein/leiningen-version) "2.8.2")
+  (let [lein-version-ok?    (lein/version-satisfies? (lein/leiningen-version) min-lein-version)
         clojure-excluded?   (some #(= % 'org.clojure/clojure) exclusions)
         clojure-version     (when-not clojure-excluded?
                               (->> dependencies
@@ -55,7 +46,7 @@
       (and clojure-version-ok? lein-version-ok?)
       (-> (update-in [:dependencies]
                      (fnil into [])
-                     [['cider/cider-nrepl (version)]])
+                     [['cider/cider-nrepl version-string]])
           (update-in [:repl-options :nrepl-middleware]
                      (fnil into [])
                      (do (require 'cider.nrepl)

test/common/cider_nrepl/plugin_test.clj

@@ -1,10 +1,8 @@
-;; TODO: The plugin test is broken due to
-;; https://github.com/technomancy/leiningen/issues/2369
 (ns cider-nrepl.plugin-test
-  (:require #_[cider-nrepl.plugin :as plugin]
+  (:require [cider-nrepl.plugin :as plugin]
             [cider.nrepl :refer [cider-middleware]]
             [clojure.test :refer :all]
-            #_[leiningen.core.main :as lein]))
+            [leiningen.core.main :as lein]))
 
 (defn- contains-cider-nrepl-dep? [{:keys [dependencies]}]
   (boolean (->> dependencies
@@ -14,38 +12,37 @@
 (defn- contains-cider-nrepl-middleware? [{{:keys [nrepl-middleware]} :repl-options}]
   (= cider-middleware nrepl-middleware))
 
-#_(deftest plugin-test
-    ;; Suppress output of leiningen.core.main/warn
-    (binding [lein/*info* false]
-      (with-redefs [plugin/version (constantly "0.11.0")]
-        (with-redefs [lein/leiningen-version (constantly "2.5.2")]
-          (testing "Valid Lein version; valid Clojure version"
-            (let [project (plugin/middleware '{:dependencies [[org.clojure/clojure "1.8.0"]]})]
-              (is (contains-cider-nrepl-dep? project))
-              (is (contains-cider-nrepl-middleware? project))))
-
-          (testing "Valid Lein version; no Clojure version specified"
-            (let [project (plugin/middleware '{})]
-              (is (contains-cider-nrepl-dep? project))
-              (is (contains-cider-nrepl-middleware? project))))
-
-          (testing "Valid Lein version; invalid Clojure version"
-            (let [project (plugin/middleware '{:dependencies [[org.clojure/clojure "1.6.0"]]})]
-              (is (not (contains-cider-nrepl-dep? project)))
-              (is (not (contains-cider-nrepl-middleware? project))))))
-
-        (with-redefs [lein/leiningen-version (constantly "2.5.1")]
-          (testing "Invalid Lein version; valid Clojure version"
-            (let [project (plugin/middleware '{:dependencies [[org.clojure/clojure "1.8.0"]]})]
-              (is (not (contains-cider-nrepl-dep? project)))
-              (is (not (contains-cider-nrepl-middleware? project)))))
-
-          (testing "Invalid Lein version; no Clojure version specified"
-            (let [project (plugin/middleware '{})]
-              (is (not (contains-cider-nrepl-dep? project)))
-              (is (not (contains-cider-nrepl-middleware? project)))))
-
-          (testing "Invalid Lein version; invalid Clojure version"
-            (let [project (plugin/middleware '{:dependencies [[org.clojure/clojure "1.6.0"]]})]
-              (is (not (contains-cider-nrepl-dep? project)))
-              (is (not (contains-cider-nrepl-middleware? project)))))))))
+(deftest plugin-test
+  ;; Suppress output of leiningen.core.main/warn
+  (binding [lein/*info* false]
+    (with-redefs [lein/leiningen-version (constantly plugin/min-lein-version)]
+      (testing "Valid Lein version; valid Clojure version"
+        (let [project (plugin/middleware '{:dependencies [[org.clojure/clojure "1.8.0"]]})]
+          (is (contains-cider-nrepl-dep? project))
+          (is (contains-cider-nrepl-middleware? project))))
+
+      (testing "Valid Lein version; no Clojure version specified"
+        (let [project (plugin/middleware '{})]
+          (is (contains-cider-nrepl-dep? project))
+          (is (contains-cider-nrepl-middleware? project))))
+
+      (testing "Valid Lein version; invalid Clojure version"
+        (let [project (plugin/middleware '{:dependencies [[org.clojure/clojure "1.6.0"]]})]
+          (is (not (contains-cider-nrepl-dep? project)))
+          (is (not (contains-cider-nrepl-middleware? project))))))
+
+    (with-redefs [lein/leiningen-version (constantly "2.5.1")]
+      (testing "Invalid Lein version; valid Clojure version"
+        (let [project (plugin/middleware '{:dependencies [[org.clojure/clojure "1.8.0"]]})]
+          (is (not (contains-cider-nrepl-dep? project)))
+          (is (not (contains-cider-nrepl-middleware? project)))))
+
+      (testing "Invalid Lein version; no Clojure version specified"
+        (let [project (plugin/middleware '{})]
+          (is (not (contains-cider-nrepl-dep? project)))
+          (is (not (contains-cider-nrepl-middleware? project)))))
+
+      (testing "Invalid Lein version; invalid Clojure version"
+        (let [project (plugin/middleware '{:dependencies [[org.clojure/clojure "1.6.0"]]})]
+          (is (not (contains-cider-nrepl-dep? project)))
+          (is (not (contains-cider-nrepl-middleware? project))))))))