Skip to content

Commit 313d400

Browse files
committed
Travis should add to _JAVA_OPTIONs on JDK9
Removed JDK9 version check from ./gradlew as it was complaining when executed in a Travis Linux VM. Should be placed into .travis.yml anyway, as the wrapper script will get overwritten when updated...
1 parent 4939796 commit 313d400

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# Or maybe the upload should always happen, but the publishing
44
# is a separate task?
55
language: java
6+
# For JDK9, add
7+
# _JAVA_OPTIONS="${JAVA_OPTIONS} --illegal-access=permit"
68
script: gradle build -Dpublish=true "-Duser=$BINTRAY_USER" "-Dkey=$BINTRAY_KEY"
79
jdk:
810
- oraclejdk8

gradlew

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,12 @@ save () {
162162
APP_ARGS=$(save "$@")
163163

164164
# Collect all arguments for the java command, following the shell quoting and substitution rules
165-
version=$("$JAVACMD" -version 2>&1 | sed -e '1{;s/^[^"]*"//;s/[.].*$//;q;}')
166-
if [ "X$version" != "X" ] && [ "0$version" -ge 9 ]; then
167-
JAVA9="--illegal-access=permit"
168-
else
169-
JAVA9=""
170-
fi
165+
#version=$("$JAVACMD" -version 2>&1 | sed -e '1{;s/^[^"]*"//;s/[.].*$//;q;}')
166+
#if [ "X$version" != "X" ] && [ "0$version" -ge 9 ]; then
167+
# JAVA9="--illegal-access=permit"
168+
#else
169+
# JAVA9=""
170+
#fi
171171
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $JAVA9 $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
172172

173173
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong

0 commit comments

Comments
 (0)