Changeset 14316 in josm for trunk

Timestamp:

2018-10-13T01:37:04+02:00 (7 years ago)

Author:

Don-vip

Message:

rework Travis config:

• add Windows build (Oracle JDK 11 only as Java is not fully supported yet)
• drop openjdk10 (not LTS)
• use openjdk11 on Linux instead of oraclejdk11
• add macOS xcode10 (ships with jdk10)

Location:

trunk

Files:

• .travis.yml (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/PlatformHookOsx.java (modified) (2 diffs)

trunk/.travis.yml

@@ -2 +2 @@
 script:
   - ant -version
-  - (eval "$ANT_INVOCATION $(test ${TRAVIS_JDK_VERSION:0:4} = open && echo -DnoJavaFX=true) test-unit-hardfail")
+  - $ANT_INVOCATION -DnoJavaFX=true test-unit-hardfail
   - "grep -L ', Failures: 0, Errors: 0, ' test/report/*.txt | xargs cat"
-os: linux
-dist: trusty
 env:
   - ANT_INVOCATION="xvfb-run ant -Dtest.headless=false"
   - ANT_INVOCATION="ant -Dtest.headless=true"
 jdk:
-  - oraclejdk11
-  - oraclejdk10
   - openjdk8
+  - openjdk11
 matrix:
   include:
+  - os: linux
+    dist: trusty
   - os: osx
-    osx_image: xcode9.2
+    osx_image: xcode9.3
     jdk: ~
+    env: ANT_INVOCATION="ant -Dtest.headless=true"
+  - os: osx
+    osx_image: xcode10
+    jdk: ~
+    env: ANT_INVOCATION="ant -Dtest.headless=true"
+  - os: windows
+    language: shell
+    jdk: oraclejdk11
     env: ANT_INVOCATION="ant -Dtest.headless=true"
 before_install:
@@ -23 +30 @@
   - tar -xzvf apache-ant-1.10.5-bin.tar.gz
   - export PATH=`pwd`/apache-ant-1.10.5/bin:$PATH
+  - if [ "$TRAVIS_OS_NAME" == "windows" ] ; then choco install jdk11 && export JAVA_HOME="/c/Program Files/Java/jdk-11" ; fi

trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java

@@ -6 +6 @@
 
 import java.awt.Desktop;
+import java.awt.GraphicsEnvironment;
 import java.awt.Image;
 import java.awt.Window;
@@ -74 +75 @@
                 quitHandler, aboutHandler, openFilesHandler, preferencesHandler}, this);
             Object appli = eawtApplication.getConstructor((Class[]) null).newInstance((Object[]) null);
-            if (Utils.getJavaVersion() >= 9) {
-                setHandlers(Desktop.class, quitHandler, aboutHandler, openFilesHandler, preferencesHandler, proxy, Desktop.getDesktop());
-            } else {
+            if (Utils.getJavaVersion() < 9) {
                 setHandlers(eawtApplication, quitHandler, aboutHandler, openFilesHandler, preferencesHandler, proxy, appli);
                 // this method has been deprecated, but without replacement. To remove with Java 9 migration
                 eawtApplication.getDeclaredMethod("setEnabledPreferencesMenu", boolean.class).invoke(appli, Boolean.TRUE);
+            } else if (!GraphicsEnvironment.isHeadless()) {
+                setHandlers(Desktop.class, quitHandler, aboutHandler, openFilesHandler, preferencesHandler, proxy, Desktop.getDesktop());
             }
             // setup the dock icon. It is automatically set with application bundle and Web start but we need