Skip to content

Commit 846b874

Browse files
committed
Update to Gradle 6.0 and enable code compliing on Java 12 and Java 13
- add second parameter to FileSystems.newFileSystem - disable build scan (only available in Gradle Enterprise: https://docs.gradle.org/current/userguide/upgrading_version_5.html#build_scan_plugin_2_x_is_no_longer_supported)
1 parent 1e48fd1 commit 846b874

File tree

6 files changed

+17
-28
lines changed

6 files changed

+17
-28
lines changed

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ before_script:
4848
- mysql -u root -e 'create database jabref'
4949

5050
script:
51-
# --scan enables the Gradle build scan, which can be used to investigate the time each action consumes
52-
# For more information see https://gradle.com/scans/get-started
53-
- if [ "$TEST_SUITE" != "guiTest" ] && [ "$TEST_SUITE" != "checkstyle" ] && [ "$TEST_SUITE" != "codecov" ]; then ./gradlew $TEST_SUITE $OPTIONS -x checkstyleJmh -x checkstyleMain -x checkstyleTest --scan; fi
51+
- if [ "$TEST_SUITE" != "guiTest" ] && [ "$TEST_SUITE" != "checkstyle" ] && [ "$TEST_SUITE" != "codecov" ]; then ./gradlew $TEST_SUITE $OPTIONS -x checkstyleJmh -x checkstyleMain -x checkstyleTest; fi
5452
- if [ "$TEST_SUITE" == "checkstyle" ]; then ./gradlew checkstyleMain checkstyleTest checkstyleJmh; fi
5553
- if [ "$TEST_SUITE" == "guiTest" ]; then ./buildres/gui-tests.sh; fi
5654
- if [ "$TEST_SUITE" == "codecov" ]; then ./gradlew jacocoTestReport && bash <(curl -s https://codecov.io/bash); fi

build.gradle

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import org.jabref.build.xjc.XjcPlugin
66
import org.jabref.build.xjc.XjcTask
77

88
// to update the gradle wrapper, execute
9-
// ./gradlew wrapper --gradle-version=4.4.1 --distribution-type=bin
9+
// ./gradlew wrapper --gradle-version=6.0 --distribution-type=bin
1010

1111
buildscript {
1212
repositories {
@@ -17,7 +17,6 @@ buildscript {
1717

1818
plugins {
1919
id 'application'
20-
id 'com.gradle.build-scan' version '3.0'
2120
id "com.simonharrer.modernizer" version '1.8.0-1'
2221
id 'me.champeau.gradle.jmh' version '0.4.8'
2322
//id 'net.ltgt.errorprone' version '0.8.1'
@@ -27,10 +26,7 @@ plugins {
2726
id 'org.beryx.jlink' version '2.16.2'
2827
}
2928

30-
// use the gradle build scan feature: https://scans.gradle.com/get-started
31-
buildScan { termsOfServiceUrl = 'https://gradle.com/terms-of-service'; termsOfServiceAgree = 'yes' }
32-
33-
gradle.startParameter.showStacktrace = org.gradle.api.logging.configuration.ShowStacktrace.ALWAYS
29+
gradle.startParameter.showStacktrace = org.gradle.api.logging.configuration.ShowStacktrace.ALWAYS
3430

3531
apply plugin: 'java'
3632
apply plugin: 'application'

gradle/wrapper/gradle-wrapper.jar

3.01 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
154154
else
155155
eval `echo args$i`="\"$arg\""
156156
fi
157-
i=$((i+1))
157+
i=`expr $i + 1`
158158
done
159159
case $i in
160-
(0) set -- ;;
161-
(1) set -- "$args0" ;;
162-
(2) set -- "$args0" "$args1" ;;
163-
(3) set -- "$args0" "$args1" "$args2" ;;
164-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
165-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
166-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
167-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
168-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
169-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
160+
0) set -- ;;
161+
1) set -- "$args0" ;;
162+
2) set -- "$args0" "$args1" ;;
163+
3) set -- "$args0" "$args1" "$args2" ;;
164+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
165+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
166+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
167+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
168+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
169+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
170170
esac
171171
fi
172172

@@ -175,14 +175,9 @@ save () {
175175
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
176176
echo " "
177177
}
178-
APP_ARGS=$(save "$@")
178+
APP_ARGS=`save "$@"`
179179

180180
# Collect all arguments for the java command, following the shell quoting and substitution rules
181181
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
182182

183-
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
184-
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
185-
cd "$(dirname "$0")"
186-
fi
187-
188183
exec "$JAVACMD" "$@"

src/main/java/org/jabref/gui/JabRefDialogService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ public boolean showPrintDialog(PrinterJob job) {
328328

329329
@Override
330330
public Optional<Path> showFileOpenFromArchiveDialog(Path archivePath) throws IOException {
331-
try (FileSystem zipFile = FileSystems.newFileSystem(archivePath, null)) {
331+
try (FileSystem zipFile = FileSystems.newFileSystem(archivePath, (ClassLoader) null)) {
332332
return new ZipFileChooser(zipFile).showAndWait();
333333
} catch (NoClassDefFoundError exc) {
334334
throw new IOException("Could not instantiate ZIP-archive reader.", exc);

0 commit comments

Comments
 (0)