Skip to content

Commit

Permalink
Merge pull request #466 from liquidz/feature/next-release
Browse files Browse the repository at this point in the history
Next release
  • Loading branch information
liquidz authored Sep 29, 2023
2 parents 58e58f0 + e5abd36 commit 1915371
Show file tree
Hide file tree
Showing 18 changed files with 45 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bb_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
bb-script:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: liquidz/[email protected]
with:
source-paths: 'clj/script'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected] refactor-nrepl/[email protected]'
8 changes: 4 additions & 4 deletions .github/workflows/document.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reviewdog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/vim_neovim.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@ 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.

=== 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)
// {{{
=== Fixed
Expand Down
2 changes: 1 addition & 1 deletion autoload/iced/nrepl/ns.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion autoload/iced/script.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion bin/iced
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions deps.edn
Original file line number Diff line number Diff line change
@@ -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"}
cider/cider-nrepl {:mvn/version "0.38.1"}
com.github.liquidz/iced-nrepl {:mvn/version "1.2.480"}}
:__middlewares__
["cider.nrepl/wrap-classpath"
Expand Down Expand Up @@ -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 {}}}
12 changes: 6 additions & 6 deletions doc/vim-iced.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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*
Expand All @@ -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
Expand Down Expand Up @@ -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"]]
}
<
Expand Down
2 changes: 1 addition & 1 deletion installer/jet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

version='0.5.25'
version='0.7.27'
file='jet.tar.gz'
if [ "$(uname)" == 'Darwin' ]; then
os='macos'
Expand Down
2 changes: 1 addition & 1 deletion installer/joker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

version='1.1.0'
version='1.3.0'
file='joker.zip'
if [ "$(uname)" == 'Darwin' ]; then
os='mac'
Expand Down
2 changes: 1 addition & 1 deletion installer/zprint-clj.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1915371

Please sign in to comment.