zellij-org/zellij
1
1
Fork 0
mirror of https://github.com/zellij-org/zellij.git synced 2024-12-18 06:32:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' of github.com:zellij-org/zellij

Browse Source
This commit is contained in:
Brooks J Rady 2021-08-31 16:39:31 +01:00
commit 8c995f2333
13 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
## [Unreleased] ## [Unreleased]
## [0.16.0] - 2021-08-31
* Plugins don't crash zellij anymore on receiving mouse events (https://github.com/zellij-org/zellij/pull/620) * Plugins don't crash zellij anymore on receiving mouse events (https://github.com/zellij-org/zellij/pull/620)
* A universal logging system has been implemented (https://github.com/zellij-org/zellij/pull/592) * A universal logging system has been implemented (https://github.com/zellij-org/zellij/pull/592)
* Added [`log`](https://docs.rs/log/0.4.14/log/#macros) crate support for logging within Zellij * Added [`log`](https://docs.rs/log/0.4.14/log/#macros) crate support for logging within Zellij

12
Cargo.lock generated
View File

@ -2622,7 +2622,7 @@ dependencies = [
[[package]] [[package]]
name = "zellij" name = "zellij"
version = "0.16.0" version = "0.17.0"
dependencies = [ dependencies = [
"insta", "insta",
"log", "log",
@ -2636,7 +2636,7 @@ dependencies = [
[[package]] [[package]]
name = "zellij-client" name = "zellij-client"
version = "0.16.0" version = "0.17.0"
dependencies = [ dependencies = [
"insta", "insta",
"log", "log",
@ -2647,7 +2647,7 @@ dependencies = [
[[package]] [[package]]
name = "zellij-server" name = "zellij-server"
version = "0.16.0" version = "0.17.0"
dependencies = [ dependencies = [
"ansi_term 0.12.1", "ansi_term 0.12.1",
"async-trait", "async-trait",
@ -2667,7 +2667,7 @@ dependencies = [
[[package]] [[package]]
name = "zellij-tile" name = "zellij-tile"
version = "0.16.0" version = "0.17.0"
dependencies = [ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
@ -2677,14 +2677,14 @@ dependencies = [
[[package]] [[package]]
name = "zellij-tile-utils" name = "zellij-tile-utils"
version = "0.16.0" version = "0.17.0"
dependencies = [ dependencies = [
"ansi_term 0.12.1", "ansi_term 0.12.1",
] ]
[[package]] [[package]]
name = "zellij-utils" name = "zellij-utils"
version = "0.16.0" version = "0.17.0"
dependencies = [ dependencies = [
"async-std", "async-std",
"backtrace", "backtrace",

8
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "zellij" name = "zellij"
version = "0.16.0" version = "0.17.0"
authors = ["Aram Drevekenin <aram@poor.dev>"] authors = ["Aram Drevekenin <aram@poor.dev>"]
edition = "2018" edition = "2018"
description = "A terminal workspace with batteries included" description = "A terminal workspace with batteries included"
@ -14,9 +14,9 @@ resolver = "2"
[dependencies] [dependencies]
names = "0.11.0" names = "0.11.0"
zellij-client = { path = "zellij-client/", version = "0.16.0" } zellij-client = { path = "zellij-client/", version = "0.17.0" }
zellij-server = { path = "zellij-server/", version = "0.16.0" } zellij-server = { path = "zellij-server/", version = "0.17.0" }
zellij-utils = { path = "zellij-utils/", version = "0.16.0" } zellij-utils = { path = "zellij-utils/", version = "0.17.0" }
log = "0.4.14" log = "0.4.14"
[dev-dependencies] [dev-dependencies]

2
Makefile.toml
View File

@ -153,7 +153,7 @@ run_task = "publish-zellij"
[tasks.release-commit] [tasks.release-commit]
dependencies = ["commit-all", "tag-release"] dependencies = ["commit-all", "tag-release"]
command = "git" command = "git"
args = ["push", "--atomic", "origin", "main", "v${CARGO_MAKE_CRATE_VERSION}"] args = ["push", "--atomic", "upstream", "main", "v${CARGO_MAKE_CRATE_VERSION}"]
[tasks.commit-all] [tasks.commit-all]
ignore_errors = true ignore_errors = true

BIN
assets/demo.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 MiB

After

Width:  |  Height:  |  Size: 3.1 MiB

BIN
assets/plugins/status-bar.wasm
View File

Binary file not shown.

BIN
assets/plugins/strider.wasm
View File

Binary file not shown.

BIN
assets/plugins/tab-bar.wasm
View File

Binary file not shown.

4
zellij-client/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "zellij-client" name = "zellij-client"
version = "0.16.0" version = "0.17.0"
authors = ["Kunal Mohan <kunalmohan99@gmail.com>"] authors = ["Kunal Mohan <kunalmohan99@gmail.com>"]
edition = "2018" edition = "2018"
description = "The client-side library for Zellij" description = "The client-side library for Zellij"
@ -11,7 +11,7 @@ license = "MIT"
[dependencies] [dependencies]
mio = "0.7.11" mio = "0.7.11"
termbg = "0.2.3" termbg = "0.2.3"
zellij-utils = { path = "../zellij-utils/", version = "0.16.0" } zellij-utils = { path = "../zellij-utils/", version = "0.17.0" }
log = "0.4.14" log = "0.4.14"
[dev-dependencies] [dev-dependencies]

4
zellij-server/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "zellij-server" name = "zellij-server"
version = "0.16.0" version = "0.17.0"
authors = ["Kunal Mohan <kunalmohan99@gmail.com>"] authors = ["Kunal Mohan <kunalmohan99@gmail.com>"]
edition = "2018" edition = "2018"
description = "The server-side library for Zellij" description = "The server-side library for Zellij"
@ -18,7 +18,7 @@ unicode-width = "0.1.8"
wasmer = "1.0.0" wasmer = "1.0.0"
wasmer-wasi = "1.0.0" wasmer-wasi = "1.0.0"
cassowary = "0.3.0" cassowary = "0.3.0"
zellij-utils = { path = "../zellij-utils/", version = "0.16.0" } zellij-utils = { path = "../zellij-utils/", version = "0.17.0" }
log = "0.4.14" log = "0.4.14"
typetag = "0.1.7" typetag = "0.1.7"
chrono = "0.4.19" chrono = "0.4.19"

2
zellij-tile-utils/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "zellij-tile-utils" name = "zellij-tile-utils"
version = "0.16.0" version = "0.17.0"
authors = ["denis <denismaximov98@gmail.com>"] authors = ["denis <denismaximov98@gmail.com>"]
edition = "2018" edition = "2018"
description = "A utility library for Zellij plugins" description = "A utility library for Zellij plugins"

2
zellij-tile/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "zellij-tile" name = "zellij-tile"
version = "0.16.0" version = "0.17.0"
authors = ["Brooks J Rady <b.j.rady@gmail.com>"] authors = ["Brooks J Rady <b.j.rady@gmail.com>"]
edition = "2018" edition = "2018"
description = "A small client-side library for writing Zellij plugins" description = "A small client-side library for writing Zellij plugins"

4
zellij-utils/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "zellij-utils" name = "zellij-utils"
version = "0.16.0" version = "0.17.0"
authors = ["Kunal Mohan <kunalmohan99@gmail.com>"] authors = ["Kunal Mohan <kunalmohan99@gmail.com>"]
edition = "2018" edition = "2018"
description = "A utility library for Zellij client and server" description = "A utility library for Zellij client and server"
@ -27,7 +27,7 @@ structopt = "0.3"
strum = "0.20.0" strum = "0.20.0"
termion = "1.5.0" termion = "1.5.0"
vte = "0.10.1" vte = "0.10.1"
zellij-tile = { path = "../zellij-tile/", version = "0.16.0" } zellij-tile = { path = "../zellij-tile/", version = "0.17.0" }
log = "0.4.14" log = "0.4.14"
log4rs = "1.0.0" log4rs = "1.0.0"