diff --git a/Cargo.lock b/Cargo.lock index b4d843321..3957d0bb1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -429,7 +429,7 @@ dependencies = [ [[package]] name = "kanata" -version = "1.6.0-prerelease-2" +version = "1.6.0-prerelease-3" dependencies = [ "anyhow", "clap", @@ -439,9 +439,9 @@ dependencies = [ "indoc", "inotify", "kanata-interception", - "kanata-keyberon", - "kanata-parser", - "kanata-tcp-protocol", + "kanata-keyberon 0.160.3 (registry+https://github.com/rust-lang/crates.io-index)", + "kanata-parser 0.160.3 (registry+https://github.com/rust-lang/crates.io-index)", + "kanata-tcp-protocol 0.160.3 (registry+https://github.com/rust-lang/crates.io-index)", "karabiner-driverkit", "log", "miette", @@ -473,7 +473,18 @@ dependencies = [ [[package]] name = "kanata-keyberon" -version = "0.160.2" +version = "0.160.3" +dependencies = [ + "arraydeque", + "heapless", + "kanata-keyberon-macros", +] + +[[package]] +name = "kanata-keyberon" +version = "0.160.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b42ee279f9e22d52ebef2d5f0abbd97ee60357f735b02a06aad1d83cea309fc" dependencies = [ "arraydeque", "heapless", @@ -492,11 +503,29 @@ dependencies = [ [[package]] name = "kanata-parser" -version = "0.160.2" +version = "0.160.3" dependencies = [ "anyhow", "itertools", - "kanata-keyberon", + "kanata-keyberon 0.160.3 (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.160.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d36624951dc5ec533e851dbdbfbf43fdf9a122e280c601a1c796f5d1a24e70" +dependencies = [ + "anyhow", + "itertools", + "kanata-keyberon 0.160.3 (registry+https://github.com/rust-lang/crates.io-index)", "log", "miette", "once_cell", @@ -520,7 +549,18 @@ dependencies = [ [[package]] name = "kanata-tcp-protocol" -version = "0.160.2" +version = "0.160.3" +dependencies = [ + "serde", + "serde_derive", + "serde_json", +] + +[[package]] +name = "kanata-tcp-protocol" +version = "0.160.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b624df938afd7c6e99cd2dbbd358909d2f875e06684442144869356d3fdb4f37" dependencies = [ "serde", "serde_derive", @@ -533,7 +573,7 @@ version = "1.1.0" dependencies = [ "anyhow", "clap", - "kanata-tcp-protocol", + "kanata-tcp-protocol 0.160.3", "log", "serde_json", "simplelog", diff --git a/Cargo.toml b/Cargo.toml index ecc67c383..b18539f2d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ members = [ [package] name = "kanata" -version = "1.6.0-prerelease-2" +version = "1.6.0-prerelease-3" authors = ["jtroo "] description = "Multi-layer keyboard customization" keywords = ["cli", "linux", "windows", "keyboard", "layout"] @@ -44,15 +44,15 @@ rustc-hash = "1.1.0" simplelog = "0.12.0" serde_json = { version = "1", features = ["alloc"], default_features = false, optional = true } -# kanata-keyberon = "0.160.2" -# kanata-parser = "0.160.2" -# kanata-tcp-protocol = "0.160.2" +kanata-keyberon = "0.160.3" +kanata-parser = "0.160.3" +kanata-tcp-protocol = "0.160.3" # 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/justfile b/justfile index e965a7fe3..8eb0f9dce 100644 --- a/justfile +++ b/justfile @@ -31,3 +31,15 @@ test: fmt: cargo fmt --all + +use_cratesio_deps: + sed -i 's/^# \(kanata-\(keyberon\|parser\|tcp-protocol\) = ".*\)$/\1/' Cargo.toml parser/Cargo.toml + sed -i 's/^\(kanata-\(keyberon\|parser\|tcp-protocol\) = .*path.*\)$/# \1/' Cargo.toml parser/Cargo.toml + +use_local_deps: + sed -i 's/^\(kanata-\(keyberon\|parser\|tcp-protocol\) = ".*\)$/# \1/' Cargo.toml parser/Cargo.toml + sed -i 's/^# \(kanata-\(keyberon\|parser\|tcp-protocol\) = .*path.*\)$/\1/' Cargo.toml parser/Cargo.toml + +change_subcrate_versions version: + sed -i 's/^version = ".*"$/version = "{{version}}"/' parser/Cargo.toml tcp_protocol/Cargo.toml keyberon/Cargo.toml + sed -i 's/^\(#\? \?kanata-\(keyberon\|parser\|tcp-protocol\)\) = ".*$/\1 = "{{version}}"/' Cargo.toml parser/Cargo.toml diff --git a/keyberon/Cargo.toml b/keyberon/Cargo.toml index 425693376..6e909c25a 100644 --- a/keyberon/Cargo.toml +++ b/keyberon/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kanata-keyberon" -version = "0.160.2" +version = "0.160.3" 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 cda614474..2793aa6a0 100644 --- a/parser/Cargo.toml +++ b/parser/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kanata-parser" -version = "0.160.2" +version = "0.160.3" 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.2" +kanata-keyberon = "0.160.3" # 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 6f4726c56..45111814c 100644 --- a/tcp_protocol/Cargo.toml +++ b/tcp_protocol/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kanata-tcp-protocol" -version = "0.160.2" +version = "0.160.3" edition = "2021" description = "TCP protocol for kanata. This does not follow semver." license = "LGPL-3.0-only"