From 33964e186552580b61b3559c2919d581e53717c9 Mon Sep 17 00:00:00 2001 From: liquidz Date: Sat, 30 Sep 2023 05:27:23 +0900 Subject: [PATCH 01/13] fix: Fix error handling on ns#alias_dict --- autoload/iced/nrepl/ns.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/iced/nrepl/ns.vim b/autoload/iced/nrepl/ns.vim index ab6369ad..1635c7cf 100644 --- a/autoload/iced/nrepl/ns.vim +++ b/autoload/iced/nrepl/ns.vim @@ -207,7 +207,7 @@ function! iced#nrepl#ns#alias_dict(ns_name) abort if kondo.is_analyzed() let aliases = kondo.ns_aliases(a:ns_name) - if !aliases + if empty(aliases) return {} endif From ff50cca2e9acc3a9b5abf465f3f55fe8c46ca322 Mon Sep 17 00:00:00 2001 From: liquidz Date: Sat, 30 Sep 2023 05:30:22 +0900 Subject: [PATCH 02/13] fix: Fix bb script for empty_port to work the latest bb --- autoload/iced/script.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/iced/script.vim b/autoload/iced/script.vim index 34e4828d..d1d014e4 100644 --- a/autoload/iced/script.vim +++ b/autoload/iced/script.vim @@ -9,7 +9,7 @@ endfunction function! iced#script#empty_port(callback) abort call s:setup() - let command = printf('bb %s/clj/script/empty_port.clj', g:vim_iced_home) + let command = printf('bb --prn %s/clj/script/empty_port.clj', g:vim_iced_home) return iced#system#get('job_out').redir(command, a:callback) endfunction From 8d20bc2bd85b820d47ad8f3febddacd445df7f95 Mon Sep 17 00:00:00 2001 From: liquidz Date: Sat, 30 Sep 2023 07:00:48 +0900 Subject: [PATCH 03/13] docs: Update changelog --- CHANGELOG.adoc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 78de22be..474d5bcd 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. This change == Unreleased (dev) +// {{{ +=== Fixed +* Fixed `IcedInstantConnect` to work correctly with the latest babashka. +* Fixed a bug on auto documentation. +// }}} + == 3.14.3240 (2023-06-24) // {{{ === Fixed From cc993ce5238852857d56d740d8c87da5a195480d Mon Sep 17 00:00:00 2001 From: liquidz Date: Sat, 30 Sep 2023 07:33:27 +0900 Subject: [PATCH 04/13] deps: Bump actions/checkout to v4 --- .github/workflows/bb_test.yml | 2 +- .github/workflows/dependencies.yml | 2 +- .github/workflows/document.yml | 8 ++++---- .github/workflows/lint.yml | 4 ++-- .github/workflows/python.yml | 2 +- .github/workflows/release.yml | 4 ++-- .github/workflows/reviewdog.yml | 2 +- .github/workflows/static.yml | 2 +- .github/workflows/vim_neovim.yml | 6 +++--- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/bb_test.yml b/.github/workflows/bb_test.yml index c1498bb8..fc5db37f 100644 --- a/.github/workflows/bb_test.yml +++ b/.github/workflows/bb_test.yml @@ -5,7 +5,7 @@ jobs: bb-script: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: liquidz/babashka-test-action@v1.1 with: source-paths: 'clj/script' diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index 76dae5e6..cc53e572 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -7,7 +7,7 @@ jobs: antq: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: liquidz/antq-action@main # with: # excludes: 'nrepl/nrepl cider/cider-nrepl@0.26.0 refactor-nrepl/refactor-nrepl@3.0.0-pr301' diff --git a/.github/workflows/document.yml b/.github/workflows/document.yml index da582a39..00467111 100644 --- a/.github/workflows/document.yml +++ b/.github/workflows/document.yml @@ -10,7 +10,7 @@ jobs: container: image: asciidoctor/docker-asciidoctor steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: build html for DEV if: github.ref == 'refs/heads/dev' @@ -28,7 +28,7 @@ jobs: needs: asciidoc runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: build help html run: bash scripts/html.sh - uses: actions/download-artifact@master @@ -49,7 +49,7 @@ jobs: needs: [asciidoc, help] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/download-artifact@master with: name: document @@ -66,7 +66,7 @@ jobs: needs: [asciidoc, help] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/download-artifact@master with: name: document diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d136b677..cc32a37f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,7 +4,7 @@ jobs: vint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: '3.x' @@ -14,7 +14,7 @@ jobs: clj-kondo: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: DeLaGuardo/setup-clojure@master with: clj-kondo: latest diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 96b05f1a..34afdc8e 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -4,7 +4,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: '3.x' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 38ee5068..7b3e7d2f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ jobs: outputs: version: ${{ steps.document.outputs.version }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: actions/setup-java@v3 @@ -36,7 +36,7 @@ jobs: needs: [change-version] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: git pull origin main - uses: ncipollo/release-action@v1 diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml index ab20d44c..4b09f9ea 100644 --- a/.github/workflows/reviewdog.yml +++ b/.github/workflows/reviewdog.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code. - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: misspell uses: reviewdog/action-misspell@v1 with: diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 35e53682..01bfadf0 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -4,7 +4,7 @@ jobs: check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v3 with: distribution: 'adopt' diff --git a/.github/workflows/vim_neovim.yml b/.github/workflows/vim_neovim.yml index dde32816..2e7b083a 100644 --- a/.github/workflows/vim_neovim.yml +++ b/.github/workflows/vim_neovim.yml @@ -9,14 +9,14 @@ jobs: neovim: [false, true] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Clone themis.vim - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: thinca/vim-themis path: .vim-themis - name: Clone vim-sexp - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: guns/vim-sexp path: .vim-sexp From dd93b15c8464efdb5c508e6d05fb26fc4d83b5e2 Mon Sep 17 00:00:00 2001 From: liquidz Date: Sat, 30 Sep 2023 07:33:57 +0900 Subject: [PATCH 05/13] deps: Update jet installer to install 0.7.27 --- installer/jet.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/jet.sh b/installer/jet.sh index 92c74a8b..e830755a 100755 --- a/installer/jet.sh +++ b/installer/jet.sh @@ -2,7 +2,7 @@ set -e -version='0.5.25' +version='0.7.27' file='jet.tar.gz' if [ "$(uname)" == 'Darwin' ]; then os='macos' From f2b37469a23d30426b7913acbde080c5de7f66c7 Mon Sep 17 00:00:00 2001 From: liquidz Date: Sat, 30 Sep 2023 07:34:15 +0900 Subject: [PATCH 06/13] deps: Update joker installer to install 1.3.0 --- installer/joker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/joker.sh b/installer/joker.sh index 85b5cf7c..1db691db 100755 --- a/installer/joker.sh +++ b/installer/joker.sh @@ -2,7 +2,7 @@ set -e -version='1.1.0' +version='1.3.0' file='joker.zip' if [ "$(uname)" == 'Darwin' ]; then os='mac' From 886cc93d0d104e29b06e582c804a01299c98df49 Mon Sep 17 00:00:00 2001 From: liquidz Date: Sat, 30 Sep 2023 07:34:33 +0900 Subject: [PATCH 07/13] deps: Update zprint installer to install 1.2.8 --- installer/zprint-clj.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/zprint-clj.sh b/installer/zprint-clj.sh index ddbe971d..6ae60b7b 100755 --- a/installer/zprint-clj.sh +++ b/installer/zprint-clj.sh @@ -2,7 +2,7 @@ set -e -version='1.2.7' +version='1.2.8' # NOTE: macOS has a same named command, so add '-clj' postfix file='zprint-clj' if [ "$(uname)" == 'Darwin' ]; then From 380788c967d37d293eb9673a49259c3949214803 Mon Sep 17 00:00:00 2001 From: liquidz Date: Sat, 30 Sep 2023 07:35:11 +0900 Subject: [PATCH 08/13] deps: Bump refactor-nrepl to 3.9.0 --- deps.edn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.edn b/deps.edn index 83d8239c..d3d059ec 100644 --- a/deps.edn +++ b/deps.edn @@ -1,7 +1,7 @@ {:paths ["clj/repl"] :deps {nrepl/nrepl {:mvn/version "1.0.0"} - refactor-nrepl/refactor-nrepl {:mvn/version "3.6.0"} cider/cider-nrepl {:mvn/version "0.31.0"} + refactor-nrepl/refactor-nrepl {:mvn/version "3.9.0"} com.github.liquidz/iced-nrepl {:mvn/version "1.2.480"}} :__middlewares__ ["cider.nrepl/wrap-classpath" From 2dee479eb1a4a88da06912e73972f51334ffd103 Mon Sep 17 00:00:00 2001 From: liquidz Date: Sat, 30 Sep 2023 07:35:29 +0900 Subject: [PATCH 09/13] deps: Bump cider-nrepl to 0.38.1 --- deps.edn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.edn b/deps.edn index d3d059ec..16233d6b 100644 --- a/deps.edn +++ b/deps.edn @@ -1,7 +1,7 @@ {:paths ["clj/repl"] :deps {nrepl/nrepl {:mvn/version "1.0.0"} - cider/cider-nrepl {:mvn/version "0.31.0"} refactor-nrepl/refactor-nrepl {:mvn/version "3.9.0"} + cider/cider-nrepl {:mvn/version "0.38.1"} com.github.liquidz/iced-nrepl {:mvn/version "1.2.480"}} :__middlewares__ ["cider.nrepl/wrap-classpath" From af0ecc243d470b1dcb8d90177233b6b80aee8696 Mon Sep 17 00:00:00 2001 From: liquidz Date: Sat, 30 Sep 2023 07:35:48 +0900 Subject: [PATCH 10/13] deps: Bump build.edn to 0.10.227 --- deps.edn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.edn b/deps.edn index 16233d6b..adc6ab4a 100644 --- a/deps.edn +++ b/deps.edn @@ -39,6 +39,6 @@ :outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "RELEASE"} org.slf4j/slf4j-nop {:mvn/version "RELEASE"}} :main-opts ["-m" "antq.core"]} - :build {:deps {com.github.liquidz/build.edn {:mvn/version "0.9.216"}} + :build {:deps {com.github.liquidz/build.edn {:mvn/version "0.10.227"}} :ns-default build-edn.main} :dev {}}} From e86780542006404b253d83b660d78d9263d286ed Mon Sep 17 00:00:00 2001 From: liquidz Date: Sat, 30 Sep 2023 07:38:44 +0900 Subject: [PATCH 11/13] chore: Update bin/iced --- bin/iced | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/iced b/bin/iced index 34506d2f..44446f06 100755 --- a/bin/iced +++ b/bin/iced @@ -9,7 +9,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/nrepl:1.0.0 refactor-nrepl/refactor-nrepl:3.6.0 cider/cider-nrepl:0.31.0 com.github.liquidz/iced-nrepl:1.2.480' +BASE_DEPENDENCIES='nrepl/nrepl:1.0.0 refactor-nrepl/refactor-nrepl:3.9.0 cider/cider-nrepl:0.38.1 com.github.liquidz/iced-nrepl:1.2.480' 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-refresh cider.nrepl/wrap-stacktrace 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.5.3' From 0321e64d401e690d62c93a6d96f6bb6aa79ae702 Mon Sep 17 00:00:00 2001 From: liquidz Date: Sat, 30 Sep 2023 07:38:53 +0900 Subject: [PATCH 12/13] docs: Update dep versions in help --- doc/vim-iced.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/vim-iced.txt b/doc/vim-iced.txt index a88fc051..abc5f5ba 100644 --- a/doc/vim-iced.txt +++ b/doc/vim-iced.txt @@ -144,7 +144,7 @@ LEININGEN~ {:user {:dependencies [[nrepl "1.0.0"] [com.github.liquidz/iced-nrepl "1.2.480"] - [cider/cider-nrepl "0.31.0"]] + [cider/cider-nrepl "0.38.1"]] :repl-options {:nrepl-middleware [cider.nrepl/wrap-classpath cider.nrepl/wrap-clojuredocs cider.nrepl/wrap-complete @@ -162,7 +162,7 @@ LEININGEN~ cider.nrepl/wrap-undef cider.nrepl/wrap-xref iced.nrepl/wrap-iced]} - :plugins [[refactor-nrepl "3.6.0"]]}} + :plugins [[refactor-nrepl "3.9.0"]]}} < *vim-iced-manual-boot* @@ -173,8 +173,8 @@ BOOT~ (require (quote boot.repl)) (swap! boot.repl/*default-dependencies* concat - '[[refactor-nrepl "3.6.0"] - [cider/cider-nrepl "0.31.0"] + '[[refactor-nrepl "3.9.0"] + [cider/cider-nrepl "0.38.1"] [com.github.liquidz/iced-nrepl "1.2.480"]]) (swap! boot.repl/*default-middleware* concat @@ -203,8 +203,8 @@ SHADOW-CLJS~ shadow-cljs.edn > { - :dependencies [[refactor-nrepl "3.6.0"] - [cider/cider-nrepl "0.31.0"] + :dependencies [[refactor-nrepl "3.9.0"] + [cider/cider-nrepl "0.38.1"] [com.github.liquidz/iced-nrepl "1.2.480"]] } < From e5abd36836320d13ba0215ee8e36ee9a73832cbd Mon Sep 17 00:00:00 2001 From: liquidz Date: Sat, 30 Sep 2023 07:42:31 +0900 Subject: [PATCH 13/13] docs: Update changelog --- CHANGELOG.adoc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 474d5bcd..3ea103f3 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -6,6 +6,14 @@ All notable changes to this project will be documented in this file. This change === Fixed * Fixed `IcedInstantConnect` to work correctly with the latest babashka. * Fixed a bug on auto documentation. + +=== Changed +* Bumped cider-nrepl to 0.38.1. +* Bumped refactor-nrepl to 3.9.0. +* Bumped build.edn to 0.10.227. +* Updated zprint installer to install v1.2.8. +* Updated joker installer to install v1.3.0. +* Updated jet installer to install v0.7.27. // }}} == 3.14.3240 (2023-06-24)