diff --git a/.cursor/skills/astvcs-add-tree-sitter-language/SKILL.md b/.cursor/skills/astvcs-add-tree-sitter-language/SKILL.md index 186ea7d..0f8cf47 100644 --- a/.cursor/skills/astvcs-add-tree-sitter-language/SKILL.md +++ b/.cursor/skills/astvcs-add-tree-sitter-language/SKILL.md @@ -14,7 +14,7 @@ metadata: ## Gather 1. Confirm the extension is not already listed in [docs/architecture.md](../../../docs/architecture.md). -2. Find a maintained `tree-sitter-*` crate on crates.io compatible with `tree-sitter = "0.26.9"`. +2. Find a maintained `tree-sitter-*` crate on crates.io compatible with `tree-sitter = "0.26.12"`. 3. Read `src/frontend/languages.rs`, `src/frontend/treesitter.rs`, and `supported_extensions()` in `src/lib.rs`. ## Act diff --git a/Cargo.lock b/Cargo.lock index e7c52fe..cda408c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -108,7 +108,7 @@ dependencies = [ [[package]] name = "astvcs" -version = "0.1.6" +version = "0.1.7" dependencies = [ "base64 0.23.1", "clap", @@ -1164,11 +1164,11 @@ checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" [[package]] name = "pem" -version = "3.0.6" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be" +checksum = "d354a98a3d1251555de99e8fdd8afda05573c31b82f59063a7b0a29b5527f120" dependencies = [ - "base64 0.22.1", + "base64 0.23.1", "serde_core", ] @@ -1382,9 +1382,9 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.14.8" +version = "0.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57f6d249aad744e274e682777a50283a225a32705394ee6d5fcc01efa25e4055" +checksum = "8774e05a7d0de114588e6a28fe7e71694b82614ed569d86d8b389dfbc98b8ad8" dependencies = [ "pem", "ring 0.17.14", @@ -1425,11 +1425,11 @@ checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "reqwest" -version = "0.13.4" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3" +checksum = "16a1cfa75cc186dd73d5818e510e042e40927bccc9c236b061cea97e1eb08029" dependencies = [ - "base64 0.22.1", + "base64 0.23.1", "bytes", "encoding_rs", "futures-channel", @@ -1781,9 +1781,9 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "similar" -version = "3.1.2" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85ee016af5d736b69fc89e19254540fa4b5f5492853fb5503920f084011c78b6" +checksum = "4f66ca1f7aca2474dc10c942eb22feffc897735f54cd1db90138c2fddb490987" dependencies = [ "bstr", ] @@ -2109,9 +2109,9 @@ dependencies = [ [[package]] name = "tree-sitter" -version = "0.26.11" +version = "0.26.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1c71c1c4cc0920b20d6b0f6572e7682cd07a6a2faec71067a31fa394c586df" +checksum = "83c567a8e18ae93f20982c90370b16fd24023aeaf52f6052b96957ab253a0fec" dependencies = [ "cc", "regex", @@ -2897,27 +2897,27 @@ checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" [[package]] name = "zstd" -version = "0.13.3" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" +checksum = "bf06bd8162af0734b344780deb55b42a2429ae430870d13fcc12f238e880fe6e" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.2.4" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" +checksum = "ae42c0555055784c70058d19ba8e275528e8a99a706684868ace5da4e716a4ab" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.16+zstd.1.5.7" +version = "2.1.0+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" +checksum = "0ef0a8027ec3ee71300ab3bcbcd0393f434aa72b91ca6d635a39941deae8eea0" dependencies = [ "cc", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index 702d01c..7b851be 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "astvcs" -version = "0.1.6" +version = "0.1.7" edition = "2024" license = "MIT" @@ -26,14 +26,14 @@ clap = { version = "4.6.1", features = ["derive"] } hex = "0.4.3" ignore = "0.4.26" regex = "1.12.4" -reqwest = { version = "0.13.4", features = ["blocking", "json", "rustls"] } +reqwest = { version = "0.13.5", features = ["blocking", "json", "rustls"] } serde = { version = "1.0.228", features = ["derive"] } serde_json = "1.0.150" sha2 = "0.11.0" -similar = "3.1.1" +similar = "3.2.0" subtle = "2.6.1" tiny_http = { version = "0.12.0", features = ["ssl-rustls"] } -tree-sitter = "0.26.9" +tree-sitter = "0.26.12" tree-sitter-bash = "0.25.1" tree-sitter-c = "0.24.2" tree-sitter-c-sharp = "0.23.5" @@ -54,10 +54,10 @@ tree-sitter-toml-ng = "0.7.0" tree-sitter-typescript = "0.23.2" tree-sitter-yaml = "0.7.2" tree-sitter-zig = "1.1.2" -zstd = "0.13.3" +zstd = "0.14.0" [dev-dependencies] proptest = "1.11.0" rand = "0.10.2" -rcgen = "0.14.8" +rcgen = "0.14.10" tempfile = "3.27.0" diff --git a/README.md b/README.md index 427edbf..cf65836 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ To inspect how nodes were paired, run `astvcs diff --view` (optionally with a pa | [docs/commands.md](docs/commands.md) | Full CLI reference (every subcommand and flag) | | [docs/architecture.md](docs/architecture.md) | Repository model, diff/merge internals, locking, network, gc/fsck | | [docs/git-integration.md](docs/git-integration.md) | Optional Git merge/diff drivers (no `.astvcs/` required) | -| [examples/README.md](examples/README.md) | Nine runnable fixture walkthroughs | +| [examples/README.md](examples/README.md) | Ten runnable fixture walkthroughs | | [docs/RELEASE.md](docs/RELEASE.md) | Tagged release packaging | Contributor Agent Skills live under [`.cursor/skills/`](.cursor/skills/) (`astvcs-develop`, `astvcs-output-ux`, `astvcs-structural-diff-merge`, `astvcs-add-tree-sitter-language`, `astvcs-integration-tests`). diff --git a/docs/RELEASE.md b/docs/RELEASE.md index 28a2d87..2f8dd13 100644 --- a/docs/RELEASE.md +++ b/docs/RELEASE.md @@ -4,7 +4,7 @@ Copy this outline when drafting a GitHub Release for a new tag. Project overview ## Version -`v0.1.6` (matches `Cargo.toml` `version` and `astvcs --version`) +`v0.1.7` (matches `Cargo.toml` `version` and `astvcs --version`) ## Requirements @@ -22,10 +22,15 @@ Download the platform archive from [GitHub Releases](https://github.com/Cod-e-Co Each archive contains three binaries: `astvcs`, `astvcs-merge-driver`, and `astvcs-diff-driver` (`.exe` on Windows). The `v0.1.0` archives shipped only the main `astvcs` binary. -Verify: `astvcs --version` should print `0.1.6`. +Verify: `astvcs --version` should print `0.1.7`. ## Changelog +### v0.1.7 + +- Bump direct crates: reqwest, similar, tree-sitter, zstd +- Bump dev-dependency rcgen + ### v0.1.6 - Add Dependabot for Cargo and GitHub Actions (grouped tree-sitter, cargo-dev, and Actions updates)