From 5a82944f94e33a3923ba11a17988a697dca05a22 Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Fri, 6 Sep 2024 16:12:21 -0400 Subject: [PATCH 1/6] Bump to 1.1.0 --- CHANGELOG.md | 2 +- Cargo.toml | 2 +- Makefile | 2 +- package-lock.json | 4 ++-- package.json | 2 +- pyproject.toml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8a3a0e..9c18894 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## devel +## 1.1.0 - Switched to using `tree-sitter-language` in the Rust bindings to remove a dependency on a specific `tree-sitter` crate version (#133). diff --git a/Cargo.toml b/Cargo.toml index 46b1d79..94a5b50 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tree-sitter-r" description = "R grammar for the tree-sitter parsing library" -version = "1.0.1" +version = "1.1.0" license = "MIT" readme = "README.md" keywords = ["incremental", "parsing", "tree-sitter", "R"] diff --git a/Makefile b/Makefile index 3074c41..36197f6 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION := 1.0.1 +VERSION := 1.1.0 LANGUAGE_NAME := tree-sitter-r diff --git a/package-lock.json b/package-lock.json index 3bba623..bd7b3c5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "tree-sitter-r", - "version": "1.0.1", + "version": "1.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "tree-sitter-r", - "version": "1.0.1", + "version": "1.1.0", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index e52a4e9..f851548 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tree-sitter-r", - "version": "1.0.1", + "version": "1.1.0", "license": "MIT", "description": "R grammar for tree-sitter", "repository": "github:r-lib/tree-sitter-r", diff --git a/pyproject.toml b/pyproject.toml index 12a0f8e..c9cf652 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [project] name = "tree-sitter-r" description = "R grammar for tree-sitter" -version = "1.0.1" +version = "1.1.0" keywords = ["incremental", "parsing", "tree-sitter", "r"] classifiers = [ "Intended Audience :: Developers", From 70d9b7227af69368596d5da7f8b51267eb45e7cc Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Fri, 6 Sep 2024 16:20:24 -0400 Subject: [PATCH 2/6] Turn off history graph in R package too --- bindings/r/.vscode/settings.json | 1 + 1 file changed, 1 insertion(+) diff --git a/bindings/r/.vscode/settings.json b/bindings/r/.vscode/settings.json index 39d8977..993509f 100644 --- a/bindings/r/.vscode/settings.json +++ b/bindings/r/.vscode/settings.json @@ -3,4 +3,5 @@ "editor.formatOnSave": true, "editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd" }, + "scm.showHistoryGraph": false } From e506f48656b6fff6eb2e4b0a88f45471f507ae25 Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Fri, 6 Sep 2024 16:23:30 -0400 Subject: [PATCH 3/6] Bump roxygen2 version --- bindings/r/DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/r/DESCRIPTION b/bindings/r/DESCRIPTION index e33b5c6..b8ac542 100644 --- a/bindings/r/DESCRIPTION +++ b/bindings/r/DESCRIPTION @@ -24,4 +24,4 @@ Config/Needs/website: tidyverse/tidytemplate Config/testthat/edition: 3 Encoding: UTF-8 Roxygen: list(markdown = TRUE) -RoxygenNote: 7.3.1 +RoxygenNote: 7.3.2 From 3ddd7ed02f4a225ef9890ecd462a1804fb2eb53e Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Fri, 6 Sep 2024 16:23:42 -0400 Subject: [PATCH 4/6] NEWS bullet --- bindings/r/NEWS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bindings/r/NEWS.md b/bindings/r/NEWS.md index 5fbe8d8..9d57a7f 100644 --- a/bindings/r/NEWS.md +++ b/bindings/r/NEWS.md @@ -1,5 +1,7 @@ # treesitter.r (development version) +* Updated to [tree-sitter-r v1.1.0](https://github.com/r-lib/tree-sitter-r/blob/main/CHANGELOG.md) (#136). + # treesitter.r 1.0.1 * Initial CRAN submission. From 2d6635efa6a7e5b834c62db939805294c848859e Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Fri, 6 Sep 2024 16:26:21 -0400 Subject: [PATCH 5/6] Update `cran-comments.md` --- bindings/r/cran-comments.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/r/cran-comments.md b/bindings/r/cran-comments.md index 8e9a374..4c7e6ee 100644 --- a/bindings/r/cran-comments.md +++ b/bindings/r/cran-comments.md @@ -1 +1 @@ -This is a new release. It should be considered alongside the treesitter R package, which is being released at the same time (right before this one was sent in). +This release is not expected to break any reverse dependencies. From 36a754b76bc13544c909a9b62043962fcb4e68bc Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Fri, 6 Sep 2024 16:38:44 -0400 Subject: [PATCH 6/6] Bump R package to 1.1.0 --- bindings/r/DESCRIPTION | 2 +- bindings/r/NEWS.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/r/DESCRIPTION b/bindings/r/DESCRIPTION index b8ac542..b2d38d3 100644 --- a/bindings/r/DESCRIPTION +++ b/bindings/r/DESCRIPTION @@ -1,6 +1,6 @@ Package: treesitter.r Title: 'R' Grammar for 'Tree-Sitter' -Version: 1.0.1.9000 +Version: 1.1.0 Authors@R: c( person("Davis", "Vaughan", , "davis@posit.co", role = c("aut", "cre")), person("Posit Software, PBC", role = c("cph", "fnd")), diff --git a/bindings/r/NEWS.md b/bindings/r/NEWS.md index 9d57a7f..0824dfa 100644 --- a/bindings/r/NEWS.md +++ b/bindings/r/NEWS.md @@ -1,4 +1,4 @@ -# treesitter.r (development version) +# treesitter.r 1.1.0 * Updated to [tree-sitter-r v1.1.0](https://github.com/r-lib/tree-sitter-r/blob/main/CHANGELOG.md) (#136).