From 1e36ce58c2ba77c6765f6a808053a0ba701daa2e Mon Sep 17 00:00:00 2001 From: Colin Jones Date: Sat, 11 Feb 2012 18:27:48 -0600 Subject: [PATCH 1/4] Revert "Revert "Upgrade to the latest nrepl"" This reverts commit b757cb0cd3ca8a6e27b5f53c2997618d197debf5. --- leiningen-core/src/leiningen/core/project.clj | 2 +- src/leiningen/repl.clj | 25 +++++++++++-------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/leiningen-core/src/leiningen/core/project.clj b/leiningen-core/src/leiningen/core/project.clj index c705cadc..2b11ccfb 100755 --- a/leiningen-core/src/leiningen/core/project.clj +++ b/leiningen-core/src/leiningen/core/project.clj @@ -82,7 +82,7 @@ "Profiles get merged into the project map. The :dev and :user profiles are active by default." (atom {:default {:resources-path ["dev-resources"] - :dependencies '[[org.clojure/tools.nrepl "0.0.5" + :dependencies '[[org.clojure/tools.nrepl "0.2.0-SNAPSHOT" :exclusions [org.clojure/clojure]] [clojure-complete "0.1.4" :exclusions [org.clojure/clojure]] diff --git a/src/leiningen/repl.clj b/src/leiningen/repl.clj index 9f4270c2..d31650a8 100644 --- a/src/leiningen/repl.clj +++ b/src/leiningen/repl.clj @@ -4,19 +4,24 @@ [reply.main :as reply] [clojure.java.io :as io] [leiningen.core.eval :as eval] - [clojure.tools.nrepl :as nrepl] + [clojure.tools.nrepl.ack :as nrepl.ack] + [clojure.tools.nrepl.handlers :as nrepl.handlers] + [clojure.tools.nrepl.server :as nrepl.server] [leiningen.core.user :as user] [leiningen.core.classpath :as classpath])) (defn- start-server [project port ack-port] (if project (eval/eval-in-project project - `(clojure.tools.nrepl/start-server ~port ~ack-port) - '(do (require 'clojure.tools.nrepl) + `(do (clojure.tools.nrepl.server/start-server + :port ~port :ack-port ~ack-port)) + '(do (require 'clojure.tools.nrepl.server) (require 'complete))) - (nrepl/start-server port ack-port))) + (nrepl.server/start-server :port port :ack-port ack-port))) -(def lein-repl-server (delay (nrepl/start-server))) +(def lein-repl-server + (delay (nrepl.server/start-server + :handler (nrepl.ack/handle-ack nrepl.handlers/unknown-op)))) (defn ^:no-project-needed repl "Start a repl session either with the current project or standalone. @@ -29,7 +34,7 @@ run outside of a project, it'll be standalone and the classpath will be that of Leiningen." ([] (repl nil)) ([project] - (nrepl/reset-ack-port!) + (nrepl.ack/reset-ack-port!) (.start (Thread. (bound-fn [] @@ -38,11 +43,11 @@ that of Leiningen." (or (System/getenv "LEIN_REPL_PORT") (:repl-port project) 0)) - (-> @lein-repl-server first .getLocalPort))))) + (-> @lein-repl-server deref :ss .getLocalPort))))) (reply/launch-nrepl (merge - {:attach (str (nrepl/wait-for-ack (or (:repl-timeout project) - (:repl-timeout (user/settings)) - 30000)))} + {:attach (str (nrepl.ack/wait-for-ack (or (:repl-timeout project) + (:repl-timeout (user/settings)) + 30000)))} (:reply-options (user/settings)) (:reply-options project))))) From cc70b87a4b0996ad749d30949846151ee0aae1b0 Mon Sep 17 00:00:00 2001 From: Colin Jones Date: Tue, 14 Feb 2012 18:31:00 -0600 Subject: [PATCH 2/4] Hook up to nrepl beta1 --- leiningen-core/src/leiningen/core/project.clj | 2 +- project.clj | 2 +- src/leiningen/repl.clj | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/leiningen-core/src/leiningen/core/project.clj b/leiningen-core/src/leiningen/core/project.clj index 2b11ccfb..fb2f809b 100755 --- a/leiningen-core/src/leiningen/core/project.clj +++ b/leiningen-core/src/leiningen/core/project.clj @@ -82,7 +82,7 @@ "Profiles get merged into the project map. The :dev and :user profiles are active by default." (atom {:default {:resources-path ["dev-resources"] - :dependencies '[[org.clojure/tools.nrepl "0.2.0-SNAPSHOT" + :dependencies '[[org.clojure/tools.nrepl "0.2.0-beta1" :exclusions [org.clojure/clojure]] [clojure-complete "0.1.4" :exclusions [org.clojure/clojure]] diff --git a/project.clj b/project.clj index d8a69a80..d48d39d3 100644 --- a/project.clj +++ b/project.clj @@ -10,7 +10,7 @@ [clucy "0.2.2"] [useful "0.7.6-alpha1"] [lein-newnew "0.2.2"] - [reply "0.1.0-SNAPSHOT"] + [reply "0.1.0-alpha2"] [org.clojars.ninjudd/data.xml "0.0.1-SNAPSHOT"]] :test-selectors {:default (complement :busted)} :eval-in-leiningen true) diff --git a/src/leiningen/repl.clj b/src/leiningen/repl.clj index d31650a8..14ca7dfd 100644 --- a/src/leiningen/repl.clj +++ b/src/leiningen/repl.clj @@ -5,7 +5,6 @@ [clojure.java.io :as io] [leiningen.core.eval :as eval] [clojure.tools.nrepl.ack :as nrepl.ack] - [clojure.tools.nrepl.handlers :as nrepl.handlers] [clojure.tools.nrepl.server :as nrepl.server] [leiningen.core.user :as user] [leiningen.core.classpath :as classpath])) @@ -21,7 +20,7 @@ (def lein-repl-server (delay (nrepl.server/start-server - :handler (nrepl.ack/handle-ack nrepl.handlers/unknown-op)))) + :handler (nrepl.ack/handle-ack nrepl.server/unknown-op)))) (defn ^:no-project-needed repl "Start a repl session either with the current project or standalone. From e707fd54a9a4165bb7cfe3c3de48c0bfd75c395e Mon Sep 17 00:00:00 2001 From: Colin Jones Date: Wed, 15 Feb 2012 18:29:55 -0600 Subject: [PATCH 3/4] Bump reply & clojure-complete versions --- leiningen-core/src/leiningen/core/project.clj | 2 +- project.clj | 2 +- src/leiningen/repl.clj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/leiningen-core/src/leiningen/core/project.clj b/leiningen-core/src/leiningen/core/project.clj index fb2f809b..4c3c0f89 100755 --- a/leiningen-core/src/leiningen/core/project.clj +++ b/leiningen-core/src/leiningen/core/project.clj @@ -84,7 +84,7 @@ (atom {:default {:resources-path ["dev-resources"] :dependencies '[[org.clojure/tools.nrepl "0.2.0-beta1" :exclusions [org.clojure/clojure]] - [clojure-complete "0.1.4" + [clojure-complete "0.2.1" :exclusions [org.clojure/clojure]] [org.thnetos/cd-client "0.3.3" :exclusions [org.clojure/clojure]]]} diff --git a/project.clj b/project.clj index d48d39d3..6f86b3ac 100644 --- a/project.clj +++ b/project.clj @@ -10,7 +10,7 @@ [clucy "0.2.2"] [useful "0.7.6-alpha1"] [lein-newnew "0.2.2"] - [reply "0.1.0-alpha2"] + [reply "0.1.0-alpha3"] [org.clojars.ninjudd/data.xml "0.0.1-SNAPSHOT"]] :test-selectors {:default (complement :busted)} :eval-in-leiningen true) diff --git a/src/leiningen/repl.clj b/src/leiningen/repl.clj index 14ca7dfd..72cf6fa9 100644 --- a/src/leiningen/repl.clj +++ b/src/leiningen/repl.clj @@ -15,7 +15,7 @@ `(do (clojure.tools.nrepl.server/start-server :port ~port :ack-port ~ack-port)) '(do (require 'clojure.tools.nrepl.server) - (require 'complete))) + (require 'complete.core))) (nrepl.server/start-server :port port :ack-port ack-port))) (def lein-repl-server From 1d84877814d32664f5f4a4664c56f3c399289384 Mon Sep 17 00:00:00 2001 From: Colin Jones Date: Sun, 19 Feb 2012 09:21:25 -0600 Subject: [PATCH 4/4] Bump reply for more CLJ-855 fun --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 6f86b3ac..e35b2229 100644 --- a/project.clj +++ b/project.clj @@ -10,7 +10,7 @@ [clucy "0.2.2"] [useful "0.7.6-alpha1"] [lein-newnew "0.2.2"] - [reply "0.1.0-alpha3"] + [reply "0.1.0-alpha4"] [org.clojars.ninjudd/data.xml "0.0.1-SNAPSHOT"]] :test-selectors {:default (complement :busted)} :eval-in-leiningen true)