Skip to content

Commit 66fa213

Browse files
committed
By-pass failing removeUnusedImports step at Java 9 builds
See diffplug/spotless#83 for details.
1 parent d299aa0 commit 66fa213

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

.travis.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,28 @@
11
language: java
22

3-
sudo: required
4-
5-
# required for oraclejdk9
3+
sudo: false
64
dist: trusty
75

86
jdk:
9-
- oraclejdk8
7+
# - oraclejdk8
108
- oraclejdk9
119

1210
addons:
1311
apt:
1412
packages:
15-
- oracle-java8-installer
13+
# - oracle-java8-installer
14+
- oracle-java9-installer
1615

1716
matrix:
1817
allow_failures:
1918
- jdk: oraclejdk9
2019

21-
before_cache:
22-
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
23-
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
24-
25-
cache:
26-
directories:
27-
- $HOME/.gradle/caches/
28-
- $HOME/.gradle/wrapper/
29-
3020
# Display Gradle version instead of letting Travis execute './gradlew assemble' by default
31-
install: ./gradlew -version
21+
install:
22+
- ./gradlew -version
3223

3324
script:
3425
- java -version
3526
- ./gradlew -version
36-
- ./gradlew --refresh-dependencies clean check -Dscan
27+
- export GRADLE_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED java.compiler/javax.tools=ALL-UNNAMED"
28+
- ./gradlew --debug --stacktrace clean check

build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,9 @@ subprojects { subproj ->
386386
importOrderFile rootProject.file('src/eclipse/junit-eclipse.importorder')
387387
eclipseFormatFile rootProject.file('src/eclipse/junit-eclipse-formatter-settings.xml')
388388
removeUnusedImports()
389+
if (org.gradle.api.JavaVersion.current() == org.gradle.api.JavaVersion.VERSION_1_8) {
390+
removeUnusedImports()
391+
}
389392

390393
trimTrailingWhitespace()
391394
endWithNewline()

0 commit comments

Comments
 (0)