diff --git a/.gitattributes b/.gitattributes index d0c0c4c1dc..e6141d8894 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ * text eol=lf *.png binary +*.jar binary diff --git a/.gitignore b/.gitignore index a1a7c08822..622ef384ba 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ gradle-app.setting # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) !gradle-wrapper.jar - ### Eclipse ### *.pydevproject .metadata diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar old mode 100644 new mode 100755 index 51288f9c2f..99340b4ad1 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d35feb4e47..2c2bbe5f9a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Dec 21 14:32:05 PST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip diff --git a/gradlew b/gradlew index 4453ccea33..cccdd3d517 100755 --- a/gradlew +++ b/gradlew @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationTest.java index 49e1343051..ec504dcd4b 100644 --- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationTest.java +++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationTest.java @@ -42,8 +42,13 @@ public void gitAttributes() throws IOException { write(".gitattributes", "* text eol=lf"); } - protected GradleRunner gradleRunner() throws IOException { - return GradleRunner.create().withProjectDir(rootFolder()).withPluginClasspath(); + protected final GradleRunner gradleRunner() throws IOException { + return GradleRunner.create() + // Test against Gradle 2.14.1 in order to maintain backwards compatibility. + // https://github.com/diffplug/spotless/issues/161 + .withGradleVersion("2.14.1") + .withProjectDir(rootFolder()) + .withPluginClasspath(); } /** Dumps the complete file contents of the folder to the console. */