Skip to content

Commit

Permalink
Bump required jsonrpc version to 1.0.24
Browse files Browse the repository at this point in the history
  • Loading branch information
svaante committed Feb 2, 2024
1 parent 72d9930 commit ef829a2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
export EMACS ?= $(shell which emacs)

JSONRPC = jsonrpc-1.0.21/jsonrpc.el
JSONRPC = jsonrpc-1.0.24/jsonrpc.el

ELFILES = dape.el dape-tests.el
ELCFILES = $(addsuffix .elc, $(basename $(ELFILES)))

all: $(ELCFILES)

$(JSONRPC):
@curl "https://elpa.gnu.org/packages/$(@D).tar.lz" -o $(@D).tar.lz
@tar -xvf $(@D).tar.lz
@curl "https://elpa.gnu.org/packages/$(@D).tar" -o $(@D).tar
@tar -xvf $(@D).tar
@rm $(@D).tar.lz

%.elc: %.el $(JSONRPC)
Expand Down
11 changes: 5 additions & 6 deletions dape.el
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
;; License: GPL-3.0-or-later
;; Version: 0.5.0
;; Homepage: https://github.com/svaante/dape
;; Package-Requires: ((emacs "29.1") (jsonrpc "1.0.21"))
;; Package-Requires: ((emacs "29.1") (jsonrpc "1.0.24"))

;; This file is not part of GNU Emacs.

Expand Down Expand Up @@ -55,8 +55,8 @@
(require 'jsonrpc)
(require 'eglot) ;; jdtls config

(unless (package-installed-p 'jsonrpc '(1 0 21))
(error "dape: Requires jsonrpc version >= 1.0.21, use `list-packages'\
(unless (package-installed-p 'jsonrpc '(1 0 24))
(error "dape: Requires jsonrpc version >= 1.0.24, use `list-packages'\
to install latest `jsonrpc' release from elpa"))


Expand Down Expand Up @@ -1728,9 +1728,8 @@ symbol `dape-connection'."
:config config
:parent parent
:server-process server-process
;; FIXME needs to update jsonrcp
;; :events-buffer-config `(:size ,(if dape-debug nil 0)
;; :format full)
:events-buffer-config `(:size ,(if dape-debug nil 0)
:format full)
:on-shutdown
(lambda (conn)
;; error prints
Expand Down

0 comments on commit ef829a2

Please sign in to comment.