From 0670d5a3ceb75acc47fd6a9d46371688066ccc66 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 08:15:38 +0000 Subject: [PATCH 1/3] Update dependency org.scalameta:scalafmt-core_2.13 to v3.8.1 --- lib/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build.gradle b/lib/build.gradle index 7b52442f92..793262f60e 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -126,7 +126,7 @@ dependencies { // palantirJavaFormat palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0' // this version needs to stay compilable against Java 8 for CI Job testNpm // scalafmt - scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:3.7.3" + scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:3.8.1" // sortPom sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.4.0' sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.12' From 276559f19e2a19d9cce28e2a08dceabb578b2f4c Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Thu, 23 May 2024 15:32:48 -0700 Subject: [PATCH 2/3] Bump scalafmt 3.7.3 -> 3.8.1 --- CHANGES.md | 5 +++-- .../main/java/com/diffplug/spotless/scala/ScalaFmtStep.java | 2 +- plugin-gradle/CHANGES.md | 5 +++-- plugin-maven/CHANGES.md | 5 +++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index def950e58a..aa342ff466 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -21,9 +21,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( ### Changes * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685)) * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045)) -* Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049)) -* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050)) * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057)) +* Bump default `scalafmt` version to latest `3.7.3` -> `3.8.1`. ([#1730](https://github.com/diffplug/spotless/pull/1730)) +* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050)) +* Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049)) * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078)) * Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115)) * Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969)) diff --git a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java index eea96d236f..9cb5852b94 100644 --- a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java +++ b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java @@ -33,7 +33,7 @@ public class ScalaFmtStep implements java.io.Serializable { private static final long serialVersionUID = 1L; - static final String DEFAULT_VERSION = "3.7.3"; + static final String DEFAULT_VERSION = "3.8.1"; private static final String DEFAULT_SCALA_MAJOR_VERSION = "2.13"; private static final String NAME = "scalafmt"; diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 0541e942f5..182ec36c8e 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -16,9 +16,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( ### Changes * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685)) * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045)) -* Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049)) -* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050)) * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057)) +* Bump default `scalafmt` version to latest `3.7.3` -> `3.8.1`. ([#1730](https://github.com/diffplug/spotless/pull/1730)) +* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050)) +* Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049)) * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078)) * Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115)) * Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969)) diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index dfe4daec1d..4eb2d8a205 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -14,9 +14,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( ### Changes * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685)) * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045)) -* Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049)) -* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050)) * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057)) +* Bump default `scalafmt` version to latest `3.7.3` -> `3.8.1`. ([#1730](https://github.com/diffplug/spotless/pull/1730)) +* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050)) +* Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049)) * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078)) * Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115)) * Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969)) From ede8f2d742fbdb2a19aeda81b1f8b1c6f4a05dcf Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Thu, 23 May 2024 16:32:28 -0700 Subject: [PATCH 3/3] Update scalafmt conf files. --- testlib/src/main/resources/scala/scalafmt/scalafmt.conf | 2 +- .../main/resources/scala/scalafmt/scalafmt.fileoverride.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testlib/src/main/resources/scala/scalafmt/scalafmt.conf b/testlib/src/main/resources/scala/scalafmt/scalafmt.conf index edea864af1..a34fa2be05 100644 --- a/testlib/src/main/resources/scala/scalafmt/scalafmt.conf +++ b/testlib/src/main/resources/scala/scalafmt/scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.7.3 +version = 3.8.1 runner.dialect = scala213 style = defaultWithAlign # For pretty alignment. maxColumn = 20 # For my teensy narrow display diff --git a/testlib/src/main/resources/scala/scalafmt/scalafmt.fileoverride.conf b/testlib/src/main/resources/scala/scalafmt/scalafmt.fileoverride.conf index e4bd1f3a44..ae2f12f789 100644 --- a/testlib/src/main/resources/scala/scalafmt/scalafmt.fileoverride.conf +++ b/testlib/src/main/resources/scala/scalafmt/scalafmt.fileoverride.conf @@ -1,4 +1,4 @@ -version = 3.7.3 +version = 3.8.1 runner.dialect = scala213 style = defaultWithAlign # For pretty alignment. maxColumn = 200 # For my mega-wide display