Skip to content

Commit 541e827

Browse files
committed
Temporarily disable cljr-hotload-dependency
This is necessary because Alembic, which our middleware uses, doesn't work with java 10. A solution is on the horizon, but in the meanwhile this is the simplest way to get clj-refactor working again on java 10.
1 parent 443f086 commit 541e827

File tree

2 files changed

+3
-31
lines changed

2 files changed

+3
-31
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Changelog
22

33
## Unreleased
4+
- Hotload dependency temporarily disabled to make the middleware run on Java 10.
45

56
- [#415](https://github.com/clojure-emacs/clj-refactor.el/issues/415) Support for deps.edn - based projects
67
- [#408](https://github.com/clojure-emacs/clj-refactor.el/pull/408) New `cljr-before-warming-ast-cache-hook`, `cljr-after-warming-ast-cache-hook` callbacks around AST warming.

clj-refactor.el

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ These are called on all .clj files in the project."
100100
:group 'cljr
101101
:type '(repeat string))
102102

103-
(defcustom cljr-hotload-dependencies t
103+
(defcustom cljr-hotload-dependencies nil
104104
"If t, newly added dependencies are also hotloaded into the repl.
105105
This only applies to dependencies added by `cljr-add-project-dependency'."
106106
:group 'cljr
@@ -2920,28 +2920,6 @@ expects for hot-loading."
29202920
(match-string-no-properties 4)
29212921
"]")))))
29222922

2923-
(defun cljr--hotload-dependency-callback (response)
2924-
(cljr--maybe-rethrow-error response)
2925-
(cljr--post-command-message "Hotloaded %s" (nrepl-dict-get response "dependency")))
2926-
2927-
(defun cljr--call-middleware-to-hotload-dependency (dep)
2928-
(cljr--call-middleware-async
2929-
(cljr--create-msg "hotload-dependency"
2930-
"coordinates" dep)
2931-
#'cljr--hotload-dependency-callback))
2932-
2933-
(defun cljr--assert-dependency-vector (string)
2934-
(with-temp-buffer
2935-
(insert string)
2936-
(goto-char (point-min))
2937-
(cl-assert (cljr--looking-at-dependency-p) nil
2938-
(format
2939-
(concat "Expected dependency vector of type "
2940-
"[org.clojure \"1.7.0\"] or "
2941-
"org.clojure {:mvn/version \"1.7.0\"}, but got '%s'")
2942-
string)))
2943-
string)
2944-
29452923
;;;###autoload
29462924
(defun cljr-hotload-dependency ()
29472925
"Download a dependency (if needed) and hotload it into the current repl session.
@@ -2950,14 +2928,7 @@ Defaults to the dependency vector at point, but prompts if none is found.
29502928
29512929
See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-hotload-dependency"
29522930
(interactive)
2953-
(cljr--ensure-op-supported "hotload-dependency")
2954-
(let ((dependency-vector (or (cljr--dependency-at-point)
2955-
(cljr--prompt-user-for "Dependency vector: "))))
2956-
2957-
(cljr--assert-dependency-vector dependency-vector)
2958-
(cljr--call-middleware-async
2959-
(cljr--create-msg "hotload-dependency" "coordinates" dependency-vector)
2960-
#'cljr--hotload-dependency-callback)))
2931+
(user-error "Temporarily disabled due to make the middleware run with Java 10."))
29612932

29622933
(defun cljr--defn-str (&optional public)
29632934
(if public

0 commit comments

Comments
 (0)