You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2020/04/04 13:41:03 UTC
[groovy] branch GROOVY_3_0_X updated (2a89989 -> bf80064)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 2a89989 GROOVY-9495: groovy.transform.NullCheck not mentioned in release notes or language documentation
new 3049428 Tweak `compilationUnit` rule
new bf80064 Use JDK 11.0.6 on github actions
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/gradle-snapshot-distribution.yml | 2 +-
.github/workflows/gradle.yml | 4 ++--
src/antlr/GroovyParser.g4 | 3 +--
3 files changed, 4 insertions(+), 5 deletions(-)
[groovy] 01/02: Tweak `compilationUnit` rule
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 3049428d0a2d9ceaa7997f4b21eadd9c00fdf641
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 4 20:13:08 2020 +0800
Tweak `compilationUnit` rule
(cherry picked from commit c4c8c3afa11eb7b44e1efa4d887a7f421f2eef73)
---
src/antlr/GroovyParser.g4 | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/antlr/GroovyParser.g4 b/src/antlr/GroovyParser.g4
index 2833376..a126114 100644
--- a/src/antlr/GroovyParser.g4
+++ b/src/antlr/GroovyParser.g4
@@ -97,8 +97,7 @@ options {
// starting point for parsing a groovy file
compilationUnit
- : nls
- packageDeclaration? sep? scriptStatements? EOF
+ : nls (packageDeclaration sep?)? scriptStatements? EOF
;
scriptStatements
[groovy] 02/02: Use JDK 11.0.6 on github actions
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit bf8006437d36164396577d7fda74dd4fafaf7c97
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 4 19:13:24 2020 +0800
Use JDK 11.0.6 on github actions
(cherry picked from commit b6cfa9368023f136b7759f4d60ac47fd3c818b49)
---
.github/workflows/gradle-snapshot-distribution.yml | 2 +-
.github/workflows/gradle.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/gradle-snapshot-distribution.yml b/.github/workflows/gradle-snapshot-distribution.yml
index 0f78fd3..8c2a032 100644
--- a/.github/workflows/gradle-snapshot-distribution.yml
+++ b/.github/workflows/gradle-snapshot-distribution.yml
@@ -23,7 +23,7 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-18.04]
- java: [11.0.5]
+ java: [11.0.6]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v1
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 58ea012..caa7b18 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -23,7 +23,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-18.04]
- java: [8.0.232, 11.0.5]
+ java: [8.0.232, 11.0.6]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v1
@@ -41,7 +41,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-18.04]
- java: [8.0.232, 11.0.5]
+ java: [8.0.232, 11.0.6]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v1