Skip to content

Commit cf7acdf

Browse files
authored
Merge pull request #299 from commonmark/java-21
Raise minimum version to Java 11 (and test on 21 as well)
2 parents a88ab23 + 01fd773 commit cf7acdf

File tree

4 files changed

+17
-14
lines changed

4 files changed

+17
-14
lines changed

.github/workflows/ci.yml

+9-6
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
java: [1.8, 11, 17]
12+
java: [11, 17, 21]
1313
steps:
1414
- name: Checkout sources
1515
uses: actions/checkout@v2
1616

1717
- name: Set up JDK
18-
uses: actions/setup-java@v1
18+
uses: actions/setup-java@v2
1919
with:
2020
java-version: ${{ matrix.java }}
21+
distribution: 'zulu'
2122

2223
- name: Build
2324
run: mvn -B package javadoc:javadoc
@@ -29,9 +30,10 @@ jobs:
2930
uses: actions/checkout@v2
3031

3132
- name: Set up JDK
32-
uses: actions/setup-java@v1
33+
uses: actions/setup-java@v2
3334
with:
34-
java-version: 1.8
35+
java-version: 11
36+
distribution: 'zulu'
3537

3638
- name: Build with coverage
3739
run: mvn -B -Pcoverage clean test jacoco:report-aggregate
@@ -46,9 +48,10 @@ jobs:
4648
uses: actions/checkout@v2
4749

4850
- name: Set up JDK
49-
uses: actions/setup-java@v1
51+
uses: actions/setup-java@v2
5052
with:
51-
java-version: 1.8
53+
java-version: 11
54+
distribution: 'zulu'
5255

5356
- name: Android Lint checks
5457
run: cd commonmark-android-test && ./gradlew :app:lint

.github/workflows/release.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ jobs:
1717
uses: actions/checkout@v2
1818

1919
- name: Set up Maven Central repository
20-
uses: actions/setup-java@v1
20+
uses: actions/setup-java@v2
2121
with:
22-
java-version: 1.8
22+
java-version: 11
23+
distribution: 'zulu'
2324
server-id: ossrh
2425
server-username: MAVEN_USERNAME # env variable to use for username in release
2526
server-password: MAVEN_PASSWORD # env variable to use for password in release

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ full library with a nice API and the following features:
2323
* Flexible (manipulate the AST after parsing, customize HTML rendering)
2424
* Extensible (tables, strikethrough, autolinking and more, see below)
2525

26-
The library is supported on Java 8 or later. It should work on Java 7
27-
and Android too, but that is on a best-effort basis, please report
28-
problems. For Android the minimum API level is 19, see the
26+
The library is supported on Java 11 and later. It should work on Android too,
27+
but that is on a best-effort basis, please report problems. For Android the
28+
minimum API level is 19, see the
2929
[commonmark-android-test](commonmark-android-test) directory.
3030

3131
Coordinates for core library (see all on [Maven Central]):

pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,9 @@
3838
<plugin>
3939
<groupId>org.apache.maven.plugins</groupId>
4040
<artifactId>maven-compiler-plugin</artifactId>
41-
<version>3.10.1</version>
41+
<version>3.12.1</version>
4242
<configuration>
43-
<source>7</source>
44-
<target>7</target>
43+
<release>11</release>
4544
</configuration>
4645
</plugin>
4746
<plugin>

0 commit comments

Comments
 (0)