Skip to content

Commit

Permalink
By-pass failing removeUnusedImports step at Java 9 builds
Browse files Browse the repository at this point in the history
See diffplug/spotless#83 for details.
  • Loading branch information
sormuras committed Mar 15, 2017
1 parent d299aa0 commit 06ddf12
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
17 changes: 9 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: java

sudo: required
sudo: true

# required for oraclejdk9
dist: trusty
Expand All @@ -13,19 +13,20 @@ addons:
apt:
packages:
- oracle-java8-installer
- oracle-java9-installer

matrix:
allow_failures:
- jdk: oraclejdk9

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
#before_cache:
# - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
# - rm -fr $HOME/.gradle/caches/*/plugin-resolution/

cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
#cache:
# directories:
# - $HOME/.gradle/caches/
# - $HOME/.gradle/wrapper/

# Display Gradle version instead of letting Travis execute './gradlew assemble' by default
install: ./gradlew -version
Expand Down
5 changes: 4 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,10 @@ subprojects { subproj ->
licenseHeaderFile headerFile, '(package|import) '
importOrderFile rootProject.file('src/eclipse/junit-eclipse.importorder')
eclipseFormatFile rootProject.file('src/eclipse/junit-eclipse-formatter-settings.xml')
removeUnusedImports()

if (org.gradle.api.JavaVersion.current() == org.gradle.api.JavaVersion.VERSION_1_8) {
removeUnusedImports()
}

trimTrailingWhitespace()
endWithNewline()
Expand Down

0 comments on commit 06ddf12

Please sign in to comment.