This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/GROOVY_2_5_X by this push:
     new 6158d37  GROOVY-9018: WARNING: package sun.awt.windows not in 
java.desktop
6158d37 is described below

commit 6158d37de7e6754ef2152179fdd1e52412b98ab2
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Mar 12 18:30:33 2019 +1000

    GROOVY-9018: WARNING: package sun.awt.windows not in java.desktop
    
    Adjust cygwin/msys detection
---
 src/bin/startGroovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/startGroovy b/src/bin/startGroovy
index b177742..31da4aa 100644
--- a/src/bin/startGroovy
+++ b/src/bin/startGroovy
@@ -278,7 +278,7 @@ startGroovy ( ) {
                JAVA_OPTS="$JAVA_OPTS -Dgroovy.jaxb=jaxb"
                [ "$GROOVY_TURN_OFF_JAVA_WARNINGS" = "true" ] &&       
JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.io=ALL-UNNAMED 
--add-opens=java.base/java.lang=ALL-UNNAMED 
--add-opens=java.base/java.lang.annotation=ALL-UNNAMED 
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED 
--add-opens=java.base/java.lang.module=ALL-UNNAMED 
--add-opens=java.base/java.lang.ref=ALL-UNNAMED 
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED 
--add-opens=java.base/java.math=ALL-UNNAMED --add-opens=java.base/ [...]
             # sun.awt.windows just on windows platforms
-            if [ $msys -o $cygwin ] ; then
+            if [ $msys = 'true' ] || [ $cygwin = 'true' ]; then
                 [ "$GROOVY_TURN_OFF_JAVA_WARNINGS" = "true" ] &&       
JAVA_OPTS="$JAVA_OPTS --add-opens=java.desktop/sun.awt.windows=ALL-UNNAMED"
             fi
     fi

Reply via email to