From 82390aed00ff8491f55edc62ef7dc809ab0242e8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 28 Apr 2023 18:48:51 +0000 Subject: [PATCH 1/8] fix(deps): update dependency com.facebook:ktfmt to v0.44 --- lib/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build.gradle b/lib/build.gradle index 9e31bed698..2df76a2864 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -89,7 +89,7 @@ dependencies { jacksonCompileOnly "com.fasterxml.jackson.core:jackson-databind:$VER_JACKSON" jacksonCompileOnly "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$VER_JACKSON" // ktfmt - ktfmtCompileOnly "com.facebook:ktfmt:0.43" + ktfmtCompileOnly "com.facebook:ktfmt:0.44" ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") { version { strictly '1.7' // for JDK 8 compatibility From 5494c80f014f048717786a949cfbb49d605968f4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 22 May 2023 18:47:43 +0000 Subject: [PATCH 2/8] fix(deps): update dependency com.google.googlejavaformat:google-java-format to v1.17.0 --- lib/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build.gradle b/lib/build.gradle index 8db911e33e..00df2648de 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -81,7 +81,7 @@ dependencies { gherkinCompileOnly 'io.cucumber:gherkin-utils:8.0.2' gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.0' // googleJavaFormat - googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.16.0' + googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.17.0' // gson gsonCompileOnly 'com.google.code.gson:gson:2.10.1' // jackson From aa8d02922a27ea9bd4114c3fb226e0558fd16e66 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Tue, 23 May 2023 14:51:27 -0700 Subject: [PATCH 3/8] Bump ktfmt default version to 0.44. --- lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java index d6a20bc5b3..098f68d5bd 100644 --- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java +++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java @@ -39,7 +39,7 @@ public class KtfmtStep { // prevent direct instantiation private KtfmtStep() {} - private static final String DEFAULT_VERSION = "0.43"; + private static final String DEFAULT_VERSION = "0.44"; static final String NAME = "ktfmt"; static final String PACKAGE = "com.facebook"; static final String MAVEN_COORDINATE = PACKAGE + ":ktfmt:"; From 7d0d409abca37e537ae53d7ec160bcd62049dda5 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Tue, 23 May 2023 14:52:01 -0700 Subject: [PATCH 4/8] Bump gjf default to 1.17.0 and mark it as the minimum required for Java 21. --- .../java/com/diffplug/spotless/java/GoogleJavaFormatStep.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java index d7ba26f384..321d05420f 100644 --- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java +++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java @@ -72,7 +72,8 @@ public static FormatterStep create(String groupArtifact, String version, String static final Jvm.Support JVM_SUPPORT = Jvm. support(NAME) .addMin(11, "1.8") // we only support google-java-format >= 1.8 due to api changes .addMin(16, "1.10.0") // java 16 requires at least 1.10.0 due to jdk api changes in JavaTokenizer - .add(11, "1.16.0"); // default version + .addMin(21, "1.17.0") // java 21 requires at least 1.17.0 due to https://github.com/google/google-java-format/issues/898 + .add(11, "1.17.0"); // default version public static String defaultGroupArtifact() { return MAVEN_COORDINATE; From 34fb099d422c6a4b36b00d2693ec8442093c8617 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Tue, 23 May 2023 15:51:41 -0700 Subject: [PATCH 5/8] Bump changelogs. --- CHANGES.md | 3 ++- plugin-gradle/CHANGES.md | 3 ++- plugin-maven/CHANGES.md | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 40e4b651df..026f66bf43 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,9 +18,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698)) * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.38.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680)) ### Changes -* Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675)) +* Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710)) * Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696)) * Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time. +* Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675)) ## [2.38.0] - 2023-04-06 ### Added diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index c85a3ac3a2..8694784fd8 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -11,9 +11,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698)) * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `6.18.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680)) ### Changes -* Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675)) +* Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710)) * Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696)) * Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time. +* Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675)) ## [6.18.0] - 2023-04-06 ### Added diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index 33168309ae..3ab9a3f92c 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -11,9 +11,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698)) * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.36.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680)) ### Changes -* Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675)) +* Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710)) * Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696)) * Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time. +* Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675)) ## [2.36.0] - 2023-04-06 ### Added From d88928a9386562cb7864dc7f65d4900e96a825fd Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Tue, 23 May 2023 15:53:56 -0700 Subject: [PATCH 6/8] Update changelogs. --- CHANGES.md | 1 + plugin-gradle/CHANGES.md | 1 + plugin-maven/CHANGES.md | 1 + 3 files changed, 3 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 026f66bf43..c75da2ca95 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -19,6 +19,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.38.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680)) ### Changes * Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710)) +* Bump default `ktfmt` version to latest `0.43` -> `0.44`.([#1691](https://github.com/diffplug/spotless/pull/1691)) * Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696)) * Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time. * Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675)) diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 8694784fd8..72889452ff 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `6.18.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680)) ### Changes * Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710)) +* Bump default `ktfmt` version to latest `0.43` -> `0.44`.([#1691](https://github.com/diffplug/spotless/pull/1691)) * Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696)) * Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time. * Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675)) diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index 3ab9a3f92c..1f7412104a 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.36.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680)) ### Changes * Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710)) +* Bump default `ktfmt` version to latest `0.43` -> `0.44`.([#1691](https://github.com/diffplug/spotless/pull/1691)) * Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696)) * Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time. * Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675)) From 973f285218b7a35eb0d124f046265a3ad2cc8988 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Tue, 23 May 2023 15:54:28 -0700 Subject: [PATCH 7/8] Why is KtfmtStepTest disabled? --- .../test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java index bfa971fc40..0bbfcabe05 100644 --- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java +++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java @@ -15,12 +15,10 @@ */ package com.diffplug.spotless.kotlin; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import com.diffplug.spotless.*; -@Disabled class KtfmtStepTest extends ResourceHarness { @Test void behavior() throws Exception { From a9fde3e4ec8b7a7162e88564f2cc926f809c318a Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Tue, 23 May 2023 15:57:20 -0700 Subject: [PATCH 8/8] Fix the broken parts of the test. --- .../com/diffplug/spotless/kotlin/KtfmtStepTest.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java index 0bbfcabe05..72e0adb4e2 100644 --- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java +++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java @@ -32,23 +32,17 @@ void dropboxStyle_0_18() throws Exception { StepHarness.forStep(step).testResource("kotlin/ktfmt/basic.dirty", "kotlin/ktfmt/basic-dropboxstyle.clean"); } - @Test - void dropboxStyle_0_19() throws Exception { - FormatterStep step = KtfmtStep.create("0.19", TestProvisioner.mavenCentral(), KtfmtStep.Style.DROPBOX, null); - StepHarness.forStep(step).testResource("kotlin/ktfmt/basic.dirty", "kotlin/ktfmt/basic-dropboxstyle.clean"); - } - @Test void equality() throws Exception { new SerializableEqualityTester() { - String version = "0.13"; + String version = "0.18"; @Override protected void setupTest(API api) { // same version == same api.areDifferentThan(); // change the version, and it's different - version = "0.12"; + version = KtfmtStep.defaultVersion(); api.areDifferentThan(); }