From 6e5600efc8a9ae2136128c0c4f348d45ee739203 Mon Sep 17 00:00:00 2001 From: Brooks J Rady Date: Tue, 4 May 2021 23:31:30 +0100 Subject: [PATCH] chore(plugin): shuffle helper library names and versions --- Cargo.lock | 11 +++++------ Cargo.toml | 5 ++--- Makefile.toml | 6 +++--- default-plugins/status-bar/Cargo.toml | 2 +- default-plugins/status-bar/src/main.rs | 2 +- default-plugins/tab-bar/Cargo.toml | 2 +- default-plugins/tab-bar/src/line.rs | 2 +- default-plugins/tab-bar/src/tab.rs | 2 +- {zellij-tile-extra => zellij-tile-utils}/Cargo.toml | 4 ++-- {zellij-tile-extra => zellij-tile-utils}/LICENSE.md | 0 {zellij-tile-extra => zellij-tile-utils}/src/lib.rs | 0 zellij-tile/Cargo.toml | 2 +- 12 files changed, 18 insertions(+), 20 deletions(-) rename {zellij-tile-extra => zellij-tile-utils}/Cargo.toml (86%) rename {zellij-tile-extra => zellij-tile-utils}/LICENSE.md (100%) rename {zellij-tile-extra => zellij-tile-utils}/src/lib.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 7302ad80..3d04bc27 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1477,7 +1477,7 @@ dependencies = [ "ansi_term 0.12.1", "colored", "zellij-tile", - "zellij-tile-extra", + "zellij-tile-utils", ] [[package]] @@ -1570,7 +1570,7 @@ dependencies = [ "ansi_term 0.12.1", "colored", "zellij-tile", - "zellij-tile-extra", + "zellij-tile-utils", ] [[package]] @@ -2223,12 +2223,11 @@ dependencies = [ "wasmer", "wasmer-wasi", "zellij-tile", - "zellij-tile-extra", ] [[package]] name = "zellij-tile" -version = "1.2.0" +version = "0.7.0" dependencies = [ "serde", "serde_json", @@ -2237,8 +2236,8 @@ dependencies = [ ] [[package]] -name = "zellij-tile-extra" -version = "1.1.0" +name = "zellij-tile-utils" +version = "0.7.0" dependencies = [ "ansi_term 0.12.1", ] diff --git a/Cargo.toml b/Cargo.toml index d030eecd..c04206da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,8 +37,7 @@ wasmer = "1.0.0" wasmer-wasi = "1.0.0" interprocess = "1.0.1" colors-transform = "0.2.5" -zellij-tile = { path = "zellij-tile/", version = "1.2.0" } -zellij-tile-extra = { path = "zellij-tile-extra/", version="1.0.0" } +zellij-tile = { path = "zellij-tile/", version = "0.7.0" } [dependencies.async-std] version = "1.3.0" @@ -54,7 +53,7 @@ structopt = "0.3" [workspace] members = [ "zellij-tile", - "zellij-tile-extra", + "zellij-tile-utils", "default-plugins/status-bar", "default-plugins/strider", "default-plugins/tab-bar", diff --git a/Makefile.toml b/Makefile.toml index 1d11f0d1..2dcb80ad 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -108,7 +108,7 @@ args = ["install", "cross"] [tasks.publish] clear = true workspace = false -dependencies = ["build-plugins-release", "wasm-opt-plugins", "build-release", "publish-zellij-tile", "publish-zellij-tile-extra"] +dependencies = ["build-plugins-release", "wasm-opt-plugins", "build-release", "publish-zellij-tile", "publish-zellij-tile-utils"] run_task = "publish-zellij" [tasks.publish-zellij-tile] @@ -117,9 +117,9 @@ cwd = "zellij-tile" command = "cargo" args = ["publish"] -[tasks.publish-zellij-tile-extra] +[tasks.publish-zellij-tile-utils] ignore_errors = true -cwd = "zellij-tile-extra" +cwd = "zellij-tile-utils" command = "cargo" args = ["publish"] diff --git a/default-plugins/status-bar/Cargo.toml b/default-plugins/status-bar/Cargo.toml index 8c6cc85d..407dd499 100644 --- a/default-plugins/status-bar/Cargo.toml +++ b/default-plugins/status-bar/Cargo.toml @@ -9,4 +9,4 @@ license = "MIT" colored = "2" ansi_term = "0.12" zellij-tile = { path = "../../zellij-tile" } -zellij-tile-extra = { path = "../../zellij-tile-extra" } \ No newline at end of file +zellij-tile-utils = { path = "../../zellij-tile-utils" } \ No newline at end of file diff --git a/default-plugins/status-bar/src/main.rs b/default-plugins/status-bar/src/main.rs index 2613ba79..e1a79d49 100644 --- a/default-plugins/status-bar/src/main.rs +++ b/default-plugins/status-bar/src/main.rs @@ -5,7 +5,7 @@ use ansi_term::Style; use std::fmt::{Display, Error, Formatter}; use zellij_tile::prelude::*; -use zellij_tile_extra::*; +use zellij_tile_utils::style; use first_line::{ctrl_keys, superkey}; use second_line::keybinds; diff --git a/default-plugins/tab-bar/Cargo.toml b/default-plugins/tab-bar/Cargo.toml index d27144dd..dd91bdb5 100644 --- a/default-plugins/tab-bar/Cargo.toml +++ b/default-plugins/tab-bar/Cargo.toml @@ -9,4 +9,4 @@ license = "MIT" colored = "2" ansi_term = "0.12" zellij-tile = { path = "../../zellij-tile" } -zellij-tile-extra = { path = "../../zellij-tile-extra" } \ No newline at end of file +zellij-tile-utils = { path = "../../zellij-tile-utils" } \ No newline at end of file diff --git a/default-plugins/tab-bar/src/line.rs b/default-plugins/tab-bar/src/line.rs index cd834655..89a7aa1b 100644 --- a/default-plugins/tab-bar/src/line.rs +++ b/default-plugins/tab-bar/src/line.rs @@ -2,7 +2,7 @@ use ansi_term::ANSIStrings; use crate::{LinePart, ARROW_SEPARATOR}; use zellij_tile::prelude::*; -use zellij_tile_extra::*; +use zellij_tile_utils::style; fn get_current_title_len(current_title: &[LinePart]) -> usize { current_title diff --git a/default-plugins/tab-bar/src/tab.rs b/default-plugins/tab-bar/src/tab.rs index b89ccb7b..7c1fe6b3 100644 --- a/default-plugins/tab-bar/src/tab.rs +++ b/default-plugins/tab-bar/src/tab.rs @@ -1,7 +1,7 @@ use crate::{LinePart, ARROW_SEPARATOR}; use ansi_term::ANSIStrings; use zellij_tile::prelude::*; -use zellij_tile_extra::*; +use zellij_tile_utils::style; pub fn active_tab(text: String, palette: Palette) -> LinePart { let left_separator = style!(palette.bg, palette.green).paint(ARROW_SEPARATOR); diff --git a/zellij-tile-extra/Cargo.toml b/zellij-tile-utils/Cargo.toml similarity index 86% rename from zellij-tile-extra/Cargo.toml rename to zellij-tile-utils/Cargo.toml index 169b5efd..a625eea9 100644 --- a/zellij-tile-extra/Cargo.toml +++ b/zellij-tile-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "zellij-tile-extra" -version = "1.1.0" +name = "zellij-tile-utils" +version = "0.7.0" authors = ["denis "] edition = "2018" description = "A utility library for Zellij plugins" diff --git a/zellij-tile-extra/LICENSE.md b/zellij-tile-utils/LICENSE.md similarity index 100% rename from zellij-tile-extra/LICENSE.md rename to zellij-tile-utils/LICENSE.md diff --git a/zellij-tile-extra/src/lib.rs b/zellij-tile-utils/src/lib.rs similarity index 100% rename from zellij-tile-extra/src/lib.rs rename to zellij-tile-utils/src/lib.rs diff --git a/zellij-tile/Cargo.toml b/zellij-tile/Cargo.toml index db004096..514eb15c 100644 --- a/zellij-tile/Cargo.toml +++ b/zellij-tile/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zellij-tile" -version = "1.2.0" +version = "0.7.0" authors = ["Brooks J Rady "] edition = "2018" description = "A small client-side library for writing Zellij plugins"