File tree Expand file tree Collapse file tree 2 files changed +13
-9
lines changed Expand file tree Collapse file tree 2 files changed +13
-9
lines changed Original file line number Diff line number Diff line change 1
1
language : java
2
2
3
- sudo : required
3
+ sudo : true
4
4
5
5
# required for oraclejdk9
6
6
dist : trusty
@@ -13,19 +13,20 @@ addons:
13
13
apt :
14
14
packages :
15
15
- oracle-java8-installer
16
+ - oracle-java9-installer
16
17
17
18
matrix :
18
19
allow_failures :
19
20
- jdk : oraclejdk9
20
21
21
- before_cache :
22
- - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
23
- - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
22
+ # before_cache:
23
+ # - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
24
+ # - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
24
25
25
- cache :
26
- directories :
27
- - $HOME/.gradle/caches/
28
- - $HOME/.gradle/wrapper/
26
+ # cache:
27
+ # directories:
28
+ # - $HOME/.gradle/caches/
29
+ # - $HOME/.gradle/wrapper/
29
30
30
31
# Display Gradle version instead of letting Travis execute './gradlew assemble' by default
31
32
install : ./gradlew -version
Original file line number Diff line number Diff line change @@ -385,7 +385,10 @@ subprojects { subproj ->
385
385
licenseHeaderFile headerFile, ' (package|import) '
386
386
importOrderFile rootProject. file(' src/eclipse/junit-eclipse.importorder' )
387
387
eclipseFormatFile rootProject. file(' src/eclipse/junit-eclipse-formatter-settings.xml' )
388
- removeUnusedImports()
388
+
389
+ if (org.gradle.api.JavaVersion . current() == org.gradle.api.JavaVersion . VERSION_1_8 ) {
390
+ removeUnusedImports()
391
+ }
389
392
390
393
trimTrailingWhitespace()
391
394
endWithNewline()
You can’t perform that action at this time.
0 commit comments