diff --git a/README.md b/README.md index e19431fdd..f616cbabb 100644 --- a/README.md +++ b/README.md @@ -298,11 +298,11 @@ Adds a `./gradlew format` task which autoformats all Java files using [Spotless] ```gradle buildscript { dependencies { - classpath 'com.diffplug.spotless:spotless-plugin-gradle:3.14.0' + classpath 'com.diffplug.spotless:spotless-plugin-gradle:5.7.0' } } -apply plugin: 'com.diffplug.gradle.spotless' +apply plugin: 'com.diffplug.spotless' spotless { java { diff --git a/changelog/@unreleased/pr-1534.v2.yml b/changelog/@unreleased/pr-1534.v2.yml new file mode 100644 index 000000000..7cca4696a --- /dev/null +++ b/changelog/@unreleased/pr-1534.v2.yml @@ -0,0 +1,5 @@ +type: improvement +improvement: + description: Update spotless to 5.7.0 + links: + - https://github.com/palantir/gradle-baseline/pull/1534 diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineFormat.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineFormat.java index 743c96fdd..b917de9e7 100644 --- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineFormat.java +++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineFormat.java @@ -48,7 +48,7 @@ class BaselineFormat extends AbstractBaselinePlugin { public void apply(Project project) { this.project = project; - project.getPluginManager().apply("com.diffplug.gradle.spotless"); + project.getPluginManager().apply("com.diffplug.spotless"); SpotlessExtension spotlessExtension = project.getExtensions().getByType(SpotlessExtension.class); // Keep spotless from eagerly configuring all other tasks. We do the same thing as the enforceCheck diff --git a/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineFormatIntegrationTest.groovy b/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineFormatIntegrationTest.groovy index 448c42ca3..cbf89a687 100644 --- a/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineFormatIntegrationTest.groovy +++ b/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineFormatIntegrationTest.groovy @@ -159,7 +159,7 @@ class BaselineFormatIntegrationTest extends AbstractPluginTest { Files.deleteIfExists(expectedFile) Files.copy(path, expectedFile) } - assertThat(path).hasSameContentAs(expectedFile) + assertThat(path).hasSameTextualContentAs(expectedFile) } } diff --git a/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineFormatTest.groovy b/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineFormatTest.groovy index 276a2d0f7..ed376787f 100644 --- a/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineFormatTest.groovy +++ b/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineFormatTest.groovy @@ -40,7 +40,7 @@ class BaselineFormatTest extends Specification { def spotlessPluginApplied() { expect: - assertTrue project.plugins.hasPlugin("com.diffplug.gradle.spotless") + assertTrue project.plugins.hasPlugin("com.diffplug.spotless") } def baselineFormatCreatesFormatTask() { diff --git a/gradle-baseline-java/src/test/resources/com/palantir/baseline/palantirjavaformat-expected/BlankLines.java b/gradle-baseline-java/src/test/resources/com/palantir/baseline/palantirjavaformat-expected/BlankLines.java index 96fe220d9..de329afc4 100644 --- a/gradle-baseline-java/src/test/resources/com/palantir/baseline/palantirjavaformat-expected/BlankLines.java +++ b/gradle-baseline-java/src/test/resources/com/palantir/baseline/palantirjavaformat-expected/BlankLines.java @@ -4,9 +4,10 @@ public class Test { /** * Docstring that looks like a list: * - *

1. hey 2. there + * 1. hey + * 2. there * - *

with blank line. + * with blank line. */ Void test() { /* diff --git a/versions.lock b/versions.lock index ac2621100..9fd4a8a97 100644 --- a/versions.lock +++ b/versions.lock @@ -3,9 +3,9 @@ classworlds:classworlds:1.1-alpha-2 (1 constraints: 3c1559a6) com.diffplug.durian:durian-collect:1.2.0 (3 constraints: 4d313bd2) com.diffplug.durian:durian-core:1.2.0 (4 constraints: 2640ae56) com.diffplug.durian:durian-io:1.2.0 (1 constraints: 1313c62d) -com.diffplug.spotless:spotless-lib:1.34.1 (2 constraints: ee242de6) -com.diffplug.spotless:spotless-lib-extra:1.34.1 (1 constraints: 49131c41) -com.diffplug.spotless:spotless-plugin-gradle:4.4.0 (1 constraints: 0a050b36) +com.diffplug.spotless:spotless-lib:2.9.0 (2 constraints: 92242da6) +com.diffplug.spotless:spotless-lib-extra:2.9.0 (1 constraints: 1b13e02d) +com.diffplug.spotless:spotless-plugin-gradle:5.7.0 (1 constraints: 0e051936) com.github.ben-manes.caffeine:caffeine:2.8.0 (1 constraints: e512b01b) com.github.kevinstern:software-and-algorithms:1.0 (1 constraints: 7e12fcf5) com.google.auto:auto-common:0.10 (3 constraints: e73129f6) @@ -15,7 +15,6 @@ com.google.auto.value:auto-value:1.5.3 (1 constraints: 1c121afb) com.google.auto.value:auto-value-annotations:1.7 (3 constraints: 7c2d7cc7) com.google.code.findbugs:jFormatString:3.0.0 (1 constraints: f01022b8) com.google.code.findbugs:jsr305:3.0.2 (5 constraints: c9524c6b) -com.google.code.gson:gson:2.8.2 (1 constraints: b61a7239) com.google.errorprone:error_prone_annotation:2.4.0 (3 constraints: 2e38d75e) com.google.errorprone:error_prone_annotations:2.4.0 (9 constraints: 3c836571) com.google.errorprone:error_prone_check_api:2.4.0 (2 constraints: 4e257bbd) @@ -27,7 +26,7 @@ com.google.errorprone:javac:9+181-r4173-1 (4 constraints: 3352a10d) com.google.errorprone:javac-shaded:9-dev-r4023-3 (1 constraints: 151671fc) com.google.googlejavaformat:google-java-format:1.4 (1 constraints: fd138d38) com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4) -com.google.guava:guava:28.0-jre (14 constraints: 8df2fcee) +com.google.guava:guava:28.0-jre (13 constraints: 9cd6d9fb) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918) com.google.j2objc:j2objc-annotations:1.3 (1 constraints: b809eda0) com.google.jimfs:jimfs:1.1 (1 constraints: fa138a38) @@ -37,16 +36,13 @@ com.google.truth:truth:0.45 (2 constraints: 1d266427) com.googlecode.concurrent-trees:concurrent-trees:2.6.1 (1 constraints: 761166da) com.googlecode.java-diff-utils:diffutils:1.3.0 (3 constraints: 3f226bf4) com.googlecode.javaewah:JavaEWAH:1.1.7 (1 constraints: 490e7f50) -com.jcraft:jsch:0.1.55 (1 constraints: 7b0ef35e) -com.jcraft:jzlib:1.1.1 (1 constraints: 430e7950) -com.palantir.javaformat:gradle-palantir-java-format:0.3.9 (1 constraints: 0e05fd35) -com.palantir.javaformat:palantir-java-format-spi:0.3.9 (1 constraints: 7b156abe) +com.palantir.javaformat:gradle-palantir-java-format:1.1.0 (1 constraints: 0405f335) +com.palantir.javaformat:palantir-java-format-spi:1.1.0 (1 constraints: 711560be) com.palantir.safe-logging:preconditions:1.13.0 (3 constraints: f8235694) com.palantir.safe-logging:safe-logging:1.13.0 (3 constraints: 25272fdf) com.palantir.tritium:tritium-registry:0.17.0 (1 constraints: 3a05383b) com.typesafe:config:1.2.0 (1 constraints: d60cb924) commons-io:commons-io:2.6 (2 constraints: 1e213039) -gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:0.7 (1 constraints: 1815b193) io.dropwizard.metrics:metrics-core:3.2.6 (1 constraints: 95108ba5) junit:junit:4.13 (8 constraints: 88716f64) net.bytebuddy:byte-buddy:1.10.5 (1 constraints: 410b37de) @@ -63,9 +59,6 @@ org.apache.maven:maven-settings:2.0.5 (1 constraints: 310dcb20) org.apache.maven.shared:maven-dependency-analyzer:1.11.3 (1 constraints: 38052f3b) org.apache.maven.wagon:wagon-provider-api:1.0-beta-2 (1 constraints: 54120e10) org.assertj:assertj-core:3.16.1 (1 constraints: 3d05483b) -org.bouncycastle:bcpg-jdk15on:1.64 (1 constraints: 1d0e4642) -org.bouncycastle:bcpkix-jdk15on:1.64 (1 constraints: 1d0e4642) -org.bouncycastle:bcprov-jdk15on:1.64 (3 constraints: ec27507c) org.checkerframework:checker-compat-qual:2.5.5 (1 constraints: 640a29b9) org.checkerframework:checker-qual:2.10.0 (2 constraints: 451a8a59) org.checkerframework:dataflow-shaded:3.1.2 (3 constraints: 2e38d15e) @@ -75,7 +68,7 @@ org.codehaus.mojo:animal-sniffer-annotations:1.17 (1 constraints: ed09d8aa) org.codehaus.plexus:plexus-component-annotations:2.1.0 (1 constraints: 8d142b84) org.codehaus.plexus:plexus-container-default:1.0-alpha-9 (4 constraints: 6841d5d5) org.codehaus.plexus:plexus-utils:1.5.1 (10 constraints: a99af4e0) -org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r (2 constraints: dc2a6fd5) +org.eclipse.jgit:org.eclipse.jgit:5.8.0.202006091008-r (2 constraints: e82a89d7) org.github.ngbinh.scalastyle:gradle-scalastyle-plugin_2.11:1.0.1 (1 constraints: 0405f135) org.hamcrest:hamcrest:2.2 (1 constraints: 720b95d5) org.hamcrest:hamcrest-core:2.2 (4 constraints: 2b2b319e) diff --git a/versions.props b/versions.props index ad62e4bd1..43441bd41 100644 --- a/versions.props +++ b/versions.props @@ -1,4 +1,4 @@ -com.diffplug.spotless:spotless-plugin-gradle = 4.4.0 +com.diffplug.spotless:spotless-plugin-gradle = 5.7.0 com.google.auto.service:auto-service = 1.0-rc4 com.google.errorprone:error_prone_annotations = 2.4.0 com.google.errorprone:error_prone_core = 2.4.0 @@ -34,4 +34,4 @@ org.mockito:* = 3.3.3 # dependency-upgrader:OFF # Don't upgrade, we will remove this in a future release. # Users should depend on this plugin directly such that it will get updated by excavator. -com.palantir.javaformat:gradle-palantir-java-format = 0.3.9 +com.palantir.javaformat:gradle-palantir-java-format = 1.1.0