From b1e828b4cda220eda3bc4e0aef2f9afba5fc9b4f Mon Sep 17 00:00:00 2001 From: Jan Tache Date: Thu, 25 Apr 2024 23:53:15 -0700 Subject: [PATCH] ver: v1.6.1-prerelease-1 --- Cargo.lock | 59 ++++++++++++++++++++++++++++++++++------- Cargo.toml | 14 +++++----- keyberon/Cargo.toml | 2 +- parser/Cargo.toml | 6 ++--- tcp_protocol/Cargo.toml | 2 +- 5 files changed, 62 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c790c6bf8..73bdd1cc9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -479,7 +479,7 @@ dependencies = [ [[package]] name = "kanata" -version = "1.6.0" +version = "1.6.1-prerelease-1" dependencies = [ "anyhow", "clap", @@ -491,9 +491,9 @@ dependencies = [ "inotify", "instant", "kanata-interception", - "kanata-keyberon", - "kanata-parser", - "kanata-tcp-protocol", + "kanata-keyberon 0.161.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kanata-parser 0.161.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kanata-tcp-protocol 0.161.0 (registry+https://github.com/rust-lang/crates.io-index)", "karabiner-driverkit", "log", "miette", @@ -526,7 +526,19 @@ dependencies = [ [[package]] name = "kanata-keyberon" -version = "0.160.5" +version = "0.161.0" +dependencies = [ + "arraydeque", + "heapless", + "kanata-keyberon-macros", + "rustc-hash", +] + +[[package]] +name = "kanata-keyberon" +version = "0.161.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f535d7539f2736b7e828324beacd0d3ad829dd62396057d49ff94886bb26014b" dependencies = [ "arraydeque", "heapless", @@ -546,11 +558,29 @@ dependencies = [ [[package]] name = "kanata-parser" -version = "0.160.5" +version = "0.161.0" +dependencies = [ + "anyhow", + "itertools", + "kanata-keyberon 0.161.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log", + "miette", + "once_cell", + "parking_lot", + "radix_trie", + "rustc-hash", + "thiserror", +] + +[[package]] +name = "kanata-parser" +version = "0.161.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "850e3d3e870cbc057aa8e2ef0aa50c991a1b002890245700cd792b15407e3a44" dependencies = [ "anyhow", "itertools", - "kanata-keyberon", + "kanata-keyberon 0.161.0 (registry+https://github.com/rust-lang/crates.io-index)", "log", "miette", "once_cell", @@ -574,7 +604,18 @@ dependencies = [ [[package]] name = "kanata-tcp-protocol" -version = "0.160.5" +version = "0.161.0" +dependencies = [ + "serde", + "serde_derive", + "serde_json", +] + +[[package]] +name = "kanata-tcp-protocol" +version = "0.161.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "316096029f6109a895b9595f4ece6f43a1f44fdbd7d5f52035daa068c9a0e8aa" dependencies = [ "serde", "serde_derive", @@ -587,7 +628,7 @@ version = "1.1.0" dependencies = [ "anyhow", "clap", - "kanata-tcp-protocol", + "kanata-tcp-protocol 0.161.0", "log", "serde_json", "simplelog", diff --git a/Cargo.toml b/Cargo.toml index 9929cfc93..f2c4c5aaa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ exclude = [ [package] name = "kanata" -version = "1.6.0" +version = "1.6.1-prerelease-1" authors = ["jtroo "] description = "Multi-layer keyboard customization" keywords = ["keyboard", "layout", "remapping"] @@ -49,15 +49,15 @@ rustc-hash = "1.1.0" simplelog = "0.12.0" serde_json = { version = "1", features = ["std"], default_features = false, optional = true } -# kanata-keyberon = "0.160.5" -# kanata-parser = "0.160.5" -# kanata-tcp-protocol = "0.160.5" +kanata-keyberon = "0.161.0" +kanata-parser = "0.161.0" +kanata-tcp-protocol = "0.161.0" # Uncomment below and comment out above for testing local changes. # Otherwise any changes to the local files will not reflect in the compiled # binary. -kanata-keyberon = { path = "keyberon" } -kanata-parser = { path = "parser" } -kanata-tcp-protocol = { path = "tcp_protocol" } +# kanata-keyberon = { path = "keyberon" } +# kanata-parser = { path = "parser" } +# kanata-tcp-protocol = { path = "tcp_protocol" } [target.'cfg(target_os = "macos")'.dependencies] karabiner-driverkit = "0.1.3" diff --git a/keyberon/Cargo.toml b/keyberon/Cargo.toml index 8de8b4862..4fc8e10fd 100644 --- a/keyberon/Cargo.toml +++ b/keyberon/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kanata-keyberon" -version = "0.160.5" +version = "0.161.0" authors = ["Guillaume Pinot ", "Robin Krahl ", "jtroo "] edition = "2021" description = "Pure Rust keyboard firmware. Fork intended for use with kanata." diff --git a/parser/Cargo.toml b/parser/Cargo.toml index ed4217d5b..eb31df0f6 100644 --- a/parser/Cargo.toml +++ b/parser/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kanata-parser" -version = "0.160.5" +version = "0.161.0" authors = ["jtroo "] description = "A parser for configuration language of kanata, a keyboard remapper." keywords = ["kanata", "parser"] @@ -21,11 +21,11 @@ rustc-hash = "1.1.0" miette = { version = "5.7.0", features = ["fancy"] } thiserror = "1.0.38" -# kanata-keyberon = "0.160.5" +kanata-keyberon = "0.161.0" # Uncomment below and comment out above for testing local changes. # Otherwise any changes to the local files will not reflect in the compiled # binary. -kanata-keyberon = { path = "../keyberon" } +# kanata-keyberon = { path = "../keyberon" } [features] cmd = [] diff --git a/tcp_protocol/Cargo.toml b/tcp_protocol/Cargo.toml index 81e632e14..9054ad47b 100644 --- a/tcp_protocol/Cargo.toml +++ b/tcp_protocol/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kanata-tcp-protocol" -version = "0.160.5" +version = "0.161.0" edition = "2021" description = "TCP protocol for kanata. This does not follow semver." license = "LGPL-3.0-only"