Merge pull request #141 from liquidz/dev

ver 0.11.2
liquidz · Aug 26, 2019 · c9cacb1 · c9cacb1
2 parents 533d1eb + 303df96
commit c9cacb1
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -41,7 +41,7 @@ jobs:
     working_directory: /mnt/volume
     steps:
       - run:
-          command: apk add --no-cache --virtual git
+          command: apk update && apk upgrade && apk add --no-cache git
       - checkout
       - run:
           command: |

diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file. This change log follows the conventions of http://keepachangelog.com/[keepachangelog.com].
 
 == Unreleased (dev)
+== 0.11.2 (2019-08-26)
+// {{{
+=== Changed
+* Bump cider-nrepl to 0.22.0-beta12.
+** Fix completion bugs with ClojureScript.
+// }}}
 
 == 0.11.1 (2019-08-24)
 // {{{
@@ -26,6 +32,7 @@ All notable changes to this project will be documented in this file. This change
 * Fix to hide virtual text if the last one has same position.
 
 // }}}
+
 == 0.11.0 (2019-08-03)
 // {{{
 === Added

diff --git a/bin/iced b/bin/iced
@@ -5,7 +5,7 @@ SCRIPT_DIR=$(cd $(dirname $0); pwd)
 PROJECT_DIR=$(cd $SCRIPT_DIR; cd ..; pwd)
 VERSION=$(grep 'Version: ' ${SCRIPT_DIR}/../doc/vim-iced.txt | cut -d' ' -f2)
 
-BASE_DEPENDENCIES='nrepl:0.6.0 refactor-nrepl:2.4.0 cider/cider-nrepl:0.22.0-beta11 iced-nrepl:0.6.0'
+BASE_DEPENDENCIES='nrepl:0.6.0 refactor-nrepl:2.4.0 cider/cider-nrepl:0.22.0-beta12 iced-nrepl:0.6.0'
 BASE_MIDDLEWARES='cider.nrepl/wrap-classpath cider.nrepl/wrap-clojuredocs cider.nrepl/wrap-complete cider.nrepl/wrap-debug cider.nrepl/wrap-format cider.nrepl/wrap-info cider.nrepl/wrap-macroexpand cider.nrepl/wrap-ns cider.nrepl/wrap-out cider.nrepl/wrap-spec cider.nrepl/wrap-test cider.nrepl/wrap-trace cider.nrepl/wrap-undef cider.nrepl/wrap-xref refactor-nrepl.middleware/wrap-refactor iced.nrepl/wrap-iced'
 
 CLJS_DEPENDENCIES='cider/piggieback:0.4.1'

diff --git a/deps.edn b/deps.edn
@@ -2,7 +2,7 @@
  :paths ["clj"]
  :deps {nrepl {:mvn/version "0.6.0"}
         refactor-nrepl {:mvn/version "2.4.0"}
-        cider/cider-nrepl {:mvn/version "0.22.0-beta11"}
+        cider/cider-nrepl {:mvn/version "0.22.0-beta12"}
         iced-nrepl {:mvn/version "0.6.0"}}
  :__middlewares__
  ["cider.nrepl/wrap-classpath"

diff --git a/doc/vim-iced.txt b/doc/vim-iced.txt
@@ -1,6 +1,6 @@
 *vim-iced.txt*      Clojure interactive development environment for Vim8/Neovim
 
-Version: 0.11.1
+Version: 0.11.2
 Author : Masashi Iizuka <[email protected]>
 License: MIT LICENSE
 
@@ -107,7 +107,7 @@ LEININGEN~
   {:user
    {:dependencies [[nrepl "0.6.0"]
                    [iced-nrepl "0.6.0"]
-                   [cider/cider-nrepl "0.22.0-beta11"]]
+                   [cider/cider-nrepl "0.22.0-beta12"]]
     :repl-options {:nrepl-middleware [cider.nrepl/wrap-classpath
                                       cider.nrepl/wrap-clojuredocs
                                       cider.nrepl/wrap-complete
@@ -135,7 +135,7 @@ BOOT~
 
   (swap! boot.repl/*default-dependencies* concat
     '[[refactor-nrepl "2.4.0"]
-      [cider/cider-nrepl "0.22.0-beta11"]
+      [cider/cider-nrepl "0.22.0-beta12"]
       [iced-nrepl "0.6.0"]])
 
   (swap! boot.repl/*default-middleware* concat
@@ -165,7 +165,7 @@ SHADOW-CLJS~
 >
   {
    :dependencies [[refactor-nrepl "2.4.0"]
-                  [cider/cider-nrepl "0.22.0-beta11"]
+                  [cider/cider-nrepl "0.22.0-beta12"]
                   [iced-nrepl "0.6.0"]]
 
    :nrepl {:cider false

diff --git a/ftplugin/clojure.vim b/ftplugin/clojure.vim
@@ -2,7 +2,7 @@ if exists('g:loaded_vim_iced')
   finish
 endif
 let g:loaded_vim_iced = 1
-let g:vim_iced_version = 1101
+let g:vim_iced_version = 1102
 
 let s:save_cpo = &cpoptions
 set cpoptions&vim