Skip to content

Commit

Permalink
Add official support for Java 17
Browse files Browse the repository at this point in the history
  • Loading branch information
mikir committed Dec 8, 2023
1 parent 0f89cc1 commit 4a18079
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ jobs:
python-version: "3.8"
java-version: "11"
clang-version-suffix: "-11"
- os: "ubuntu-20.04"
python-version: "3.8"
java-version: "17"
clang-version-suffix: "-11"
- os: "ubuntu-22.04"
python-version: "3.8"
java-version: "8"
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ jobs:
- os: "windows-2022"
python-version: "3.8"
java-version: "11"
- os: "windows-2022"
python-version: "3.8"
java-version: "17"
name: OS ${{matrix.os}}, Python ${{matrix.python-version}}, Java ${{matrix.java-version}}
env:
CPPCHECK_HOME: "/c/Program Files/Cppcheck"
Expand Down
1 change: 1 addition & 0 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ gpg.executable - GnuPG executable to use for artifact signing. Defa
<fileset id="zserio_bundle.sources" dir="${zserio_bundle.javadocs_src_dir}"/>
<javadoc packagenames="zserio.*" destdir="${zserio_bundle.javadocs_dir}"
failonerror="true" failonwarning="true" useexternalfile="true">
<arg value="-Xdoclint:-missing"/>
<fileset refid="zserio_bundle.sources"/>
<doctitle>
<![CDATA[<h1>Zserio Bundle</h1><h2>Version ${zserio.version}</h2]]>
Expand Down
2 changes: 1 addition & 1 deletion compiler/extensions/java/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ For an **API documentation** see the [Java Runtime Library](https://zserio.org/d

## Supported Java Versions

Zserio Java generator supports the Java SE 8 (LTS) and the Java SE 11 (LTS).
Zserio Java generator supports the Java SE 8 (LTS), the Java SE 11 (LTS) and the Java SE 17 (LTS).

Although newer Java versions are not tested, they should work as well as long as they are backward compatible.

Expand Down
9 changes: 8 additions & 1 deletion test/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,14 @@ spotbugs.home_dir - Location of the spotbugs tool. If not set, spo

<record name="${zserio_java_test.log_file}" action="stop"/>

<loadresource property="num_tests">
<condition property="supports_javascripts">
<or>
<equals arg1="1.8" arg2="${ant.java.version}"/>
<equals arg1="11" arg2="${ant.java.version}"/>
</or>
</condition>

<loadresource if:set="supports_javascripts" property="num_tests">
<fileset file="${zserio_java_test.log_file}"/>
<filterchain>
<containsregex pattern=".*\s+(\d+) tests found.*" replace="\1 "/>
Expand Down

0 comments on commit 4a18079

Please sign in to comment.