summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYichen Yan <oraluben@outlook.com>2023-11-01 20:51:42 +0800
committerDibyendu Majumdar <dibyendumajumdar@users.noreply.github.com>2023-11-01 18:56:50 +0000
commit3cad2b3c0af2418d51bb1ee46b1e24c5b362ba63 (patch)
tree047e860f88dcb2896d3782c44460338f44879acf
parent906241d5257f99b9c7de2da5340f5a59c2fb688d (diff)
downloadSimple-3cad2b3c0af2418d51bb1ee46b1e24c5b362ba63.tar.gz
Simple-3cad2b3c0af2418d51bb1ee46b1e24c5b362ba63.zip
Update JDK to 21 (#26)
* Backport fix for set_def killing new_def (#21) * Use JDK 21 * Remove duplicate field in pom * Enable GA test for pull requests --------- Co-authored-by: XmiliaH <45106915+XmiliaH@users.noreply.github.com>
-rw-r--r--.github/workflows/maven.yml7
-rw-r--r--language/pom.xml5
-rw-r--r--pom.xml6
3 files changed, 7 insertions, 11 deletions
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 7f25a193..b810104b 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -1,6 +1,6 @@
name: Java CI with Maven
-on: [push]
+on: [ push, pull_request ]
jobs:
test:
@@ -9,10 +9,11 @@ jobs:
steps:
- uses: actions/checkout@v3
- - name: Set up JDK 20
+ - name: Set up JDK 21
uses: actions/setup-java@v3
with:
- java-version: '20'
+ java-version: '21'
distribution: 'temurin'
+ cache: 'maven'
- name: Build with Maven
run: mvn --batch-mode --update-snapshots verify \ No newline at end of file
diff --git a/language/pom.xml b/language/pom.xml
index 9073598f..dbb4710e 100644
--- a/language/pom.xml
+++ b/language/pom.xml
@@ -11,11 +11,10 @@
<name>SeaOfNodes Demo Simple Language Grammar</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.target>20</maven.compiler.target>
- <maven.compiler.source>20</maven.compiler.source>
+ <maven.compiler.target>21</maven.compiler.target>
+ <maven.compiler.source>21</maven.compiler.source>
<antlr4test-maven-plugin.version>1.22</antlr4test-maven-plugin.version>
<antlr.version>4.11.1</antlr.version>
- <antlr4test-maven-plugin.version>1.21</antlr4test-maven-plugin.version>
<junit.version>4.13.2</junit.version>
</properties>
<dependencies>
diff --git a/pom.xml b/pom.xml
index 888cd2f1..cdd5f9ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,16 +46,12 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.2</version>
- <configuration>
- <argLine>--enable-preview</argLine>
- </configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
- <release>20</release>
- <compilerArgs>--enable-preview</compilerArgs>
+ <release>21</release>
</configuration>
</plugin>
</plugins>