Merge pull request #136 from DavisVaughan/feature/rc-1-1-0

DavisVaughan · web-flow · commit ac939363ced6 · 2024-09-06T16:53:09.000-04:00
RC 1.1.0
diff --git 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
@@ -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
diff --git 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
 }
diff --git 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")),
@@ -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
diff --git a/bindings/r/NEWS.md b/bindings/r/NEWS.md
@@ -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
 
diff --git 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.
diff --git a/package-lock.json b/package-lock.json
diff --git 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
@@ -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",

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,5 @@`
`3`	`3`	`"editor.formatOnSave": true,`
`4`	`4`	`"editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"`
`5`	`5`	`},`
	`6`	`+ "scm.showHistoryGraph": false`
`6`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +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).`
	`1`	`+This release is not expected to break any reverse dependencies.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "tree-sitter-r",`
`3`		`- "version": "1.0.1",`
	`3`	`+ "version": "1.1.0",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"description": "R grammar for tree-sitter",`
`6`	`6`	`"repository": "github:r-lib/tree-sitter-r",`