Changeset 17239 in josm

Timestamp:

2020-10-19T03:04:49+02:00 (4 years ago)

Author:

Don-vip

Message:

see #19937 - Fix building on java 15. Disable java 14 fully, 16-ea for macOS (patch by Stereo)

See ​https://github.com/openstreetmap/josm/pull/66

Location:

trunk

Files:

• .github/workflows/ant.yml (modified) (4 diffs)
• native/macosx/macos-jpackage.sh (modified) (2 diffs)

trunk/.github/workflows/ant.yml

@@ -23 +23 @@
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
-        java: [8, 11, 14, 15, 16-ea]
+        java: [8, 11, 15, 16-ea]
         os: [ubuntu-latest, macos-latest, windows-latest]
         headless: ["true", "false"]
@@ -30 +30 @@
             os: macos-latest
           - java: 11
+            os: macos-latest
+          - java: 16-ea
             os: macos-latest
           - headless: "false"
@@ -125 +127 @@
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing its ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
-          asset_path: dist/JOSM.zip
+          asset_path: app/JOSM.zip
           asset_name: JOSM-${{ runner.os}}-java${{ matrix.java }}.zip
           asset_content_type: application/zip
@@ -136 +138 @@
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing its ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
-          asset_path: dist/josm-custom.jar
+          asset_path: app/josm-custom.jar
           asset_name: josm-latest.jar
           asset_content_type: application/java-archive

trunk/native/macosx/macos-jpackage.sh

@@ -17 +17 @@
 echo "Building JOSM.app"
 
+mkdir app
 jpackage -n "JOSM" --input dist --main-jar josm-custom.jar \
     --main-class org.openstreetmap.josm.gui.MainApplication \
-    --icon ./native/macosx/JOSM.icns --type app-image --dest dist \
+    --icon ./native/macosx/JOSM.icns --type app-image --dest app \
     --java-options "-Xmx8192m" --app-version $1 \
     --copyright "JOSM, and all its integral parts, are released under the GNU General Public License v2 or later" \
@@ -69 +70 @@
 
 codesign -vvv --timestamp --options runtime --deep --force --sign "$SIGNING_KEY_NAME" \
-    dist/JOSM.app/Contents/MacOS/JOSM \
-    dist/JOSM.app/Contents/MacOS/libapplauncher.dylib \
-    dist/JOSM.app/Contents/runtime/Contents/Home/lib/*.jar \
-    dist/JOSM.app/Contents/runtime/Contents/Home/lib/*.dylib \
-    dist/JOSM.app/Contents/runtime/Contents/MacOS/libjli.dylib
+    app/JOSM.app/Contents/MacOS/JOSM \
+    app/JOSM.app/Contents/MacOS/libapplauncher.dylib \
+    app/JOSM.app/Contents/runtime/Contents/Home/lib/*.jar \
+    app/JOSM.app/Contents/runtime/Contents/Home/lib/*.dylib \
+    app/JOSM.app/Contents/runtime/Contents/MacOS/libjli.dylib
 
-codesign -vvv --timestamp --entitlements native/macosx/josm.entitlements --options runtime --force --sign "$SIGNING_KEY_NAME" dist/JOSM.app
+codesign -vvv --timestamp --entitlements native/macosx/josm.entitlements --options runtime --force --sign "$SIGNING_KEY_NAME" app/JOSM.app
 
-codesign -vvv dist/JOSM.app
+codesign -vvv app/JOSM.app
 
 echo "Preparing for notarization"
-ditto -c -k --zlibCompressionLevel 9 --keepParent dist/JOSM.app dist/JOSM.zip
+ditto -c -k --zlibCompressionLevel 9 --keepParent app/JOSM.app app/JOSM.zip
 
 echo "Uploading to Apple"
-xcrun altool --notarize-app -f dist/JOSM.zip -p "$APPLE_ID_PW" -u "thomas.skowron@fossgis.de" --primary-bundle-id de.openstreetmap.josm
+xcrun altool --notarize-app -f app/JOSM.zip -p "$APPLE_ID_PW" -u "thomas.skowron@fossgis.de" --primary-bundle-id de.openstreetmap.josm