Skip to content

Commit

Permalink
Update JDK to 21 (SeaOfNodes#26)
Browse files Browse the repository at this point in the history
* Backport fix for set_def killing new_def (SeaOfNodes#21)

* Use JDK 21

* Remove duplicate field in pom

* Enable GA test for pull requests

---------

Co-authored-by: XmiliaH <[email protected]>
  • Loading branch information
2 people authored and dibyendumajumdar committed Nov 1, 2023
1 parent 906241d commit 3cad2b3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Java CI with Maven

on: [push]
on: [ push, pull_request ]

jobs:
test:
Expand All @@ -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
5 changes: 2 additions & 3 deletions language/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 1 addition & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 3cad2b3

Please sign in to comment.