Skip to content

Commit 06ddf12

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

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

.travis.yml

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

3-
sudo: required
3+
sudo: true
44

55
# required for oraclejdk9
66
dist: trusty
@@ -13,19 +13,20 @@ addons:
1313
apt:
1414
packages:
1515
- oracle-java8-installer
16+
- oracle-java9-installer
1617

1718
matrix:
1819
allow_failures:
1920
- jdk: oraclejdk9
2021

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/
2425

25-
cache:
26-
directories:
27-
- $HOME/.gradle/caches/
28-
- $HOME/.gradle/wrapper/
26+
#cache:
27+
# directories:
28+
# - $HOME/.gradle/caches/
29+
# - $HOME/.gradle/wrapper/
2930

3031
# Display Gradle version instead of letting Travis execute './gradlew assemble' by default
3132
install: ./gradlew -version

build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,10 @@ subprojects { subproj ->
385385
licenseHeaderFile headerFile, '(package|import) '
386386
importOrderFile rootProject.file('src/eclipse/junit-eclipse.importorder')
387387
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+
}
389392

390393
trimTrailingWhitespace()
391394
endWithNewline()

0 commit comments

Comments
 (0)