Changeset 36151 in osm for applications/editors/josm/plugins/build-common.xml

Timestamp:

2023-10-02T17:18:00+02:00 (3 years ago)

Author:

taylor.smock

Message:

Fix #8647: Add Garmin FIT parsing (as a plugin)

Documentation/files used for implementation:

• ​https://developer.garmin.com/fit/protocol/ (no click-through license required at time of writing)
• FIT files attached to https://josm.openstreetmap.de/ticket/8647 along with decoded gpx files from gpsbabel (files provided by richlv)

File:

• applications/editors/josm/plugins/build-common.xml (modified) (1 diff)

applications/editors/josm/plugins/build-common.xml

@@ -56 +56 @@
     <condition property="isMac"><os family="Mac"/></condition>
     <!-- For Java specific stuff by version -->
-    <condition property="isJava9"><matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9]|2[0-9])" /></condition>
-    <condition property="isJava10"><matches string="${ant.java.version}" pattern="1[0-9]|2[0-9]" /></condition>
-    <condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]|2[0-9]" /></condition>
-    <condition property="isJava12"><matches string="${ant.java.version}" pattern="1[2-9]|2[0-9]" /></condition>
-    <condition property="isJava13"><matches string="${ant.java.version}" pattern="1[3-9]|2[0-9]" /></condition>
-    <condition property="isJava14"><matches string="${ant.java.version}" pattern="1[4-9]|2[0-9]" /></condition>
-    <condition property="isJava15"><matches string="${ant.java.version}" pattern="1[5-9]|2[0-9]" /></condition>
-    <condition property="isJava16"><matches string="${ant.java.version}" pattern="1[6-9]|2[0-9]" /></condition>
-    <condition property="isJava20"><matches string="${ant.java.version}" pattern="2[0-9]" /></condition>
-    <!-- Disable jacoco on Java 20+ (Jacoco does not yet support Java 20+) -->
+    <condition property="isJava9"><matches string="${ant.java.version}" pattern="(1.)?(9|[1-9][0-9])" /></condition>
+    <condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]|[2-9][0-9]" /></condition>
+    <condition property="isJava14"><matches string="${ant.java.version}" pattern="1[4-9]|[2-9][0-9]" /></condition>
+    <condition property="isJava15"><matches string="${ant.java.version}" pattern="1[5-9]|[2-9][0-9]" /></condition>
+    <condition property="isJava17"><matches string="${ant.java.version}" pattern="1[7-9]|[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 21+ (Jacoco does not yet support Java 21+) -->
     <condition property="coverageByDefault">
         <not>
-            <isset property="isJava20"/>
+            <isset property="isJava21"/>
         </not>
     </condition>