Support for Java 18 (#836)

* Support for Java 18

* Test Text Blocks and Records with Java 17 and higher version.

Author: nakamura-to

.github/workflows/ci.yml

@@ -24,6 +24,16 @@ jobs:
         shell: bash
         run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
 
+      - name: Set up JDK 18
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 18
+
+      - name: Prepare JDK18 env var
+        shell: bash
+        run: echo "JDK18=$JAVA_HOME" >> $GITHUB_ENV
+
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
@@ -64,6 +74,16 @@ jobs:
         shell: bash
         run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
 
+      - name: Set up JDK 18
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 18
+
+      - name: Prepare JDK18 env var
+        shell: bash
+        run: echo "JDK18=$JAVA_HOME" >> $GITHUB_ENV
+
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
@@ -92,8 +112,19 @@ jobs:
             -PtestUseModule=true
             javaToolchains
             integration-test-java:test
-            integration-test-java-latest:test
-  
+            integration-test-java-additional:test
+
+      - name: Test with Java 18 using JPMS
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: |
+            -Pdriver=${{ matrix.driver }}
+            -PtestJavaLangVersion=18
+            -PtestUseModule=true
+            javaToolchains
+            integration-test-java:test
+            integration-test-java-additional:test
+
       - name: Upload reports
         if: failure()
         uses: actions/upload-artifact@v3
@@ -119,6 +150,16 @@ jobs:
         shell: bash
         run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
 
+      - name: Set up JDK 18
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 18
+
+      - name: Prepare JDK18 env var
+        shell: bash
+        run: echo "JDK18=$JAVA_HOME" >> $GITHUB_ENV
+
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:

README.md

@@ -189,7 +189,7 @@ Major versions
 ### Compatibility matrix
 
 |         | Doma 1 | Doma 2 |
-| ------- | ------ | ------ |
+|---------| ------ | ------ |
 | Java 6  |   v    |        |
 | Java 7  |   v    |        |
 | Java 8  |   v    |   v    |
@@ -202,5 +202,6 @@ Major versions
 | Java 15 |        |   v    |
 | Java 16 |        |   v    |
 | Java 17 |        |   v    |
+| Java 18 |        |   v    |
 
   [apt]: https://www.jcp.org/en/jsr/detail?id=269

gradle.properties

@@ -9,7 +9,7 @@ sonatypePassword=
 release.useAutomaticVersion=true
 
 org.gradle.caching=true
-org.gradle.java.installations.fromEnv=JDK8
+org.gradle.java.installations.fromEnv=JDK8,JDK18
 # https://github.com/diffplug/spotless/issues/834
 org.gradle.jvmargs=-Dfile.encoding=UTF-8 \
     --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \

integration-test-java-latest/.gitignore renamed to integration-test-java-additional/.gitignore

@@ -1,9 +1,12 @@
+import java.lang.Integer.max
+
 plugins {
     java
 }
 
 val moduleInfoFile = "$projectDir/src/main/java/module-info.java"
 val useModule: Boolean = project.properties["testUseModule"].toString().toBoolean()
+val javaLangVersion: Int = project.properties["testJavaLangVersion"].toString().toInt()
 
 delete(moduleInfoFile)
 if (useModule) {
@@ -22,5 +25,6 @@ dependencies {
 }
 
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+    val version = max(17, javaLangVersion)
+    toolchain.languageVersion.set(JavaLanguageVersion.of(version))
 }