Changeset 18488 in josm

Timestamp:

2022-06-13T18:53:37+02:00 (2 years ago)

Author:

Don-vip

Message:

see #21005 - java 18 support

Location:

trunk

Files:

• .github/workflows/ant-test.yml (modified) (1 diff)
• .github/workflows/ant.yml (modified) (2 diffs)
• build.xml (modified) (1 diff)

trunk/.github/workflows/ant-test.yml

@@ -22 +22 @@
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
-        java: [8, 11, 17, 18-ea]
+        java: [8, 11, 17, 18, 19-ea]
         os: [ubuntu-latest, macos-latest, windows-latest]
     name: Java ${{ matrix.java }} on ${{ matrix.os }}

trunk/.github/workflows/ant.yml

@@ -4 +4 @@
   # ANT_HOME is also our ant version
   ANT_HOME: 'apache-ant-1.10.12'
-  JAVAFX_VERSION: '17.0.2'
+  JAVAFX_VERSION: '17.0.3'
 on:
   push:
@@ -72 +72 @@
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
-        java: [8, 11, 17, 18-ea]
+        java: [8, 11, 17, 18, 19-ea]
         os: [ubuntu-latest, macos-latest, windows-latest]
     name: Java ${{ matrix.java }} on ${{ matrix.os }}

trunk/build.xml

@@ -104 +104 @@
         <condition property="isJava20"><matches string="${ant.java.version}" pattern="[2-9][0-9]" /></condition>
         <condition property="isJava21"><matches string="${ant.java.version}" pattern="2[1-9]|[3-9][0-9]" /></condition>
-        <!-- Disable jacoco on Java 18+, see https://github.com/jacoco/jacoco/pull/1132 -->
+        <!-- Disable jacoco on Java 19+, see https://github.com/jacoco/jacoco/pull/1282 -->
         <condition property="coverageByDefault">
             <not>
-                <isset property="isJava18"/>
+                <isset property="isJava19"/>
             </not>
         </condition>