Skip to content

Commit

Permalink
Merge pull request #136 from DavisVaughan/feature/rc-1-1-0
Browse files Browse the repository at this point in the history
RC 1.1.0
  • Loading branch information
DavisVaughan authored Sep 6, 2024
2 parents 6d0733f + 36a754b commit ac93936
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions bindings/r/.vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
"editor.formatOnSave": true,
"editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"
},
"scm.showHistoryGraph": false
}
4 changes: 2 additions & 2 deletions bindings/r/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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", , "[email protected]", role = c("aut", "cre")),
person("Posit Software, PBC", role = c("cph", "fnd")),
Expand All @@ -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
4 changes: 3 additions & 1 deletion bindings/r/NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# 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).

# treesitter.r 1.0.1

Expand Down
2 changes: 1 addition & 1 deletion bindings/r/cran-comments.md
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit ac93936

Please sign in to comment.