Skip to content

Commit 79c8ba5

Browse files
authored
Support for Java 19 (#887)
* Support for Java 19 * Change version description * Fix table format
1 parent fc3874a commit 79c8ba5

File tree

3 files changed

+35
-34
lines changed

3 files changed

+35
-34
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ jobs:
2424
shell: bash
2525
run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
2626

27-
- name: Set up JDK 18
27+
- name: Set up JDK 19
2828
uses: actions/setup-java@v3
2929
with:
3030
distribution: 'temurin'
31-
java-version: 18
31+
java-version: 19
3232

33-
- name: Prepare JDK18 env var
33+
- name: Prepare JDK19 env var
3434
shell: bash
35-
run: echo "JDK18=$JAVA_HOME" >> $GITHUB_ENV
35+
run: echo "JDK19=$JAVA_HOME" >> $GITHUB_ENV
3636

3737
- name: Set up JDK 17
3838
uses: actions/setup-java@v3
@@ -74,15 +74,15 @@ jobs:
7474
shell: bash
7575
run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
7676

77-
- name: Set up JDK 18
77+
- name: Set up JDK 19
7878
uses: actions/setup-java@v3
7979
with:
8080
distribution: 'temurin'
81-
java-version: 18
81+
java-version: 19
8282

83-
- name: Prepare JDK18 env var
83+
- name: Prepare JDK19 env var
8484
shell: bash
85-
run: echo "JDK18=$JAVA_HOME" >> $GITHUB_ENV
85+
run: echo "JDK19=$JAVA_HOME" >> $GITHUB_ENV
8686

8787
- name: Set up JDK 17
8888
uses: actions/setup-java@v3
@@ -114,12 +114,12 @@ jobs:
114114
integration-test-java:test
115115
integration-test-java-additional:test
116116
117-
- name: Test with Java 18 using JPMS
117+
- name: Test with Java 19 using JPMS
118118
uses: gradle/gradle-build-action@v2
119119
with:
120120
arguments: |
121121
-Pdriver=${{ matrix.driver }}
122-
-PtestJavaLangVersion=18
122+
-PtestJavaLangVersion=19
123123
-PtestUseModule=true
124124
javaToolchains
125125
integration-test-java:test
@@ -150,15 +150,15 @@ jobs:
150150
shell: bash
151151
run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
152152

153-
- name: Set up JDK 18
153+
- name: Set up JDK 19
154154
uses: actions/setup-java@v3
155155
with:
156156
distribution: 'temurin'
157-
java-version: 18
157+
java-version: 19
158158

159-
- name: Prepare JDK18 env var
159+
- name: Prepare JDK19 env var
160160
shell: bash
161-
run: echo "JDK18=$JAVA_HOME" >> $GITHUB_ENV
161+
run: echo "JDK19=$JAVA_HOME" >> $GITHUB_ENV
162162

163163
- name: Set up JDK 17
164164
uses: actions/setup-java@v3

README.md

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ for more information.
6262

6363
### SQL templates
6464

65-
Written in Java 15:
65+
Written in Java 15 or above:
6666

6767
```java
6868
@Dao
@@ -181,27 +181,28 @@ Major versions
181181

182182
### Status and Repository
183183

184-
| Version | Status | Repository | Branch |
185-
| -------------------------------------- | ----------------- | -------------------------------------- | ------ |
186-
| [Doma 1](http://doma.seasar.org/) | stable | https://github.com/seasarorg/doma/ | master |
187-
| [Doma 2](http://doma.readthedocs.org/) | stable | https://github.com/domaframework/doma/ | master |
184+
| Version | Status | Repository | Branch |
185+
|----------------------------------------|--------|----------------------------------------|--------|
186+
| [Doma 1](http://doma.seasar.org/) | stable | https://github.com/seasarorg/doma/ | master |
187+
| [Doma 2](http://doma.readthedocs.org/) | stable | https://github.com/domaframework/doma/ | master |
188188

189189
### Compatibility matrix
190190

191191
| | Doma 1 | Doma 2 |
192-
|---------| ------ | ------ |
193-
| Java 6 | v | |
194-
| Java 7 | v | |
195-
| Java 8 | v | v |
196-
| Java 9 | | v |
197-
| Java 10 | | v |
198-
| Java 11 | | v |
199-
| Java 12 | | v |
200-
| Java 13 | | v |
201-
| Java 14 | | v |
202-
| Java 15 | | v |
203-
| Java 16 | | v |
204-
| Java 17 | | v |
205-
| Java 18 | | v |
192+
|---------|--------|--------|
193+
| Java 6 | v | |
194+
| Java 7 | v | |
195+
| Java 8 | v | v |
196+
| Java 9 | | v |
197+
| Java 10 | | v |
198+
| Java 11 | | v |
199+
| Java 12 | | v |
200+
| Java 13 | | v |
201+
| Java 14 | | v |
202+
| Java 15 | | v |
203+
| Java 16 | | v |
204+
| Java 17 | | v |
205+
| Java 18 | | v |
206+
| Java 19 | | v |
206207

207208
[apt]: https://www.jcp.org/en/jsr/detail?id=269

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ sonatypePassword=
88
release.useAutomaticVersion=true
99

1010
org.gradle.caching=true
11-
org.gradle.java.installations.fromEnv=JDK8,JDK18
11+
org.gradle.java.installations.fromEnv=JDK8,JDK19
1212
# https://github.com/diffplug/spotless/issues/834
1313
org.gradle.jvmargs=-Dfile.encoding=UTF-8
1414

0 commit comments

Comments
 (0)