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

13 files changed, 21 insertions, 19 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 656730a9..1da63b00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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/)
 
 ## [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)
 * 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
diff --git a/Cargo.lock b/Cargo.lock
index 12545181..6c2cdcd3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2622,7 +2622,7 @@ dependencies = [
 
 [[package]]
 name = "zellij"
-version = "0.16.0"
+version = "0.17.0"
 dependencies = [
  "insta",
  "log",
@@ -2636,7 +2636,7 @@ dependencies = [
 
 [[package]]
 name = "zellij-client"
-version = "0.16.0"
+version = "0.17.0"
 dependencies = [
  "insta",
  "log",
@@ -2647,7 +2647,7 @@ dependencies = [
 
 [[package]]
 name = "zellij-server"
-version = "0.16.0"
+version = "0.17.0"
 dependencies = [
  "ansi_term 0.12.1",
  "async-trait",
@@ -2667,7 +2667,7 @@ dependencies = [
 
 [[package]]
 name = "zellij-tile"
-version = "0.16.0"
+version = "0.17.0"
 dependencies = [
  "serde",
  "serde_json",
@@ -2677,14 +2677,14 @@ dependencies = [
 
 [[package]]
 name = "zellij-tile-utils"
-version = "0.16.0"
+version = "0.17.0"
 dependencies = [
  "ansi_term 0.12.1",
 ]
 
 [[package]]
 name = "zellij-utils"
-version = "0.16.0"
+version = "0.17.0"
 dependencies = [
  "async-std",
  "backtrace",
diff --git a/Cargo.toml b/Cargo.toml
index d41cf02b..e5a7af57 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zellij"
-version = "0.16.0"
+version = "0.17.0"
 authors = ["Aram Drevekenin <aram@poor.dev>"]
 edition = "2018"
 description = "A terminal workspace with batteries included"
@@ -14,9 +14,9 @@ resolver = "2"
 
 [dependencies]
 names = "0.11.0"
-zellij-client = { path = "zellij-client/", version = "0.16.0" }
-zellij-server = { path = "zellij-server/", version = "0.16.0" }
-zellij-utils = { path = "zellij-utils/", version = "0.16.0" }
+zellij-client = { path = "zellij-client/", version = "0.17.0" }
+zellij-server = { path = "zellij-server/", version = "0.17.0" }
+zellij-utils = { path = "zellij-utils/", version = "0.17.0" }
 log = "0.4.14"
 
 [dev-dependencies]
diff --git a/Makefile.toml b/Makefile.toml
index dcf63fca..7438ceee 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -153,7 +153,7 @@ run_task = "publish-zellij"
 [tasks.release-commit]
 dependencies = ["commit-all", "tag-release"]
 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]
 ignore_errors = true
diff --git a/assets/demo.gif b/assets/demo.gif
index 05ecb1cf..714274e5 100644
--- a/assets/demo.gif
+++ b/assets/demo.gif
diff --git a/assets/plugins/status-bar.wasm b/assets/plugins/status-bar.wasm
index a43ebeb2..d1ad39e9 100644
--- a/assets/plugins/status-bar.wasm
+++ b/assets/plugins/status-bar.wasm
diff --git a/assets/plugins/strider.wasm b/assets/plugins/strider.wasm
index 6c7f23c5..b57557a7 100644
--- a/assets/plugins/strider.wasm
+++ b/assets/plugins/strider.wasm
diff --git a/assets/plugins/tab-bar.wasm b/assets/plugins/tab-bar.wasm
index 25eded4b..896512fe 100644
--- a/assets/plugins/tab-bar.wasm
+++ b/assets/plugins/tab-bar.wasm
diff --git a/zellij-client/Cargo.toml b/zellij-client/Cargo.toml
index b9edb0ad..271fb716 100644
--- a/zellij-client/Cargo.toml
+++ b/zellij-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zellij-client"
-version = "0.16.0"
+version = "0.17.0"
 authors = ["Kunal Mohan <kunalmohan99@gmail.com>"]
 edition = "2018"
 description = "The client-side library for Zellij"
@@ -11,7 +11,7 @@ license = "MIT"
 [dependencies]
 mio = "0.7.11"
 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"
 
 [dev-dependencies]
diff --git a/zellij-server/Cargo.toml b/zellij-server/Cargo.toml
index c9c6491e..fe56b742 100644
--- a/zellij-server/Cargo.toml
+++ b/zellij-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zellij-server"
-version = "0.16.0"
+version = "0.17.0"
 authors = ["Kunal Mohan <kunalmohan99@gmail.com>"]
 edition = "2018"
 description = "The server-side library for Zellij"
@@ -18,7 +18,7 @@ unicode-width = "0.1.8"
 wasmer = "1.0.0"
 wasmer-wasi = "1.0.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"
 typetag = "0.1.7"
 chrono = "0.4.19"
diff --git a/zellij-tile-utils/Cargo.toml b/zellij-tile-utils/Cargo.toml
index d1e7d233..79c9763f 100644
--- a/zellij-tile-utils/Cargo.toml
+++ b/zellij-tile-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zellij-tile-utils"
-version = "0.16.0"
+version = "0.17.0"
 authors = ["denis <denismaximov98@gmail.com>"]
 edition = "2018"
 description = "A utility library for Zellij plugins"
diff --git a/zellij-tile/Cargo.toml b/zellij-tile/Cargo.toml
index 90be3e08..0ee63e7f 100644
--- a/zellij-tile/Cargo.toml
+++ b/zellij-tile/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zellij-tile"
-version = "0.16.0"
+version = "0.17.0"
 authors = ["Brooks J Rady <b.j.rady@gmail.com>"]
 edition = "2018"
 description = "A small client-side library for writing Zellij plugins"
diff --git a/zellij-utils/Cargo.toml b/zellij-utils/Cargo.toml
index 5761f414..6e4b72cc 100644
--- a/zellij-utils/Cargo.toml
+++ b/zellij-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zellij-utils"
-version = "0.16.0"
+version = "0.17.0"
 authors = ["Kunal Mohan <kunalmohan99@gmail.com>"]
 edition = "2018"
 description = "A utility library for Zellij client and server"
@@ -27,7 +27,7 @@ structopt = "0.3"
 strum = "0.20.0"
 termion = "1.5.0"
 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"
 log4rs = "1.0.0"