fix(deps): update dependency org.scalameta:scalafmt-core_2.13 to v3.6…

….1 (#1373)
diffplug · Nov 24, 2022 · 12c88cf · 12c88cf
2 parents 3d635ee + 284dfaf
commit 12c88cf
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -17,6 +17,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
 ### Changes
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
+* Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
 
 ## [2.30.0] - 2022-09-14
 ### Added

diff --git a/lib/build.gradle b/lib/build.gradle
@@ -91,7 +91,7 @@ dependencies {
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.47.0'
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.47.0'
 
-	String VER_SCALAFMT="3.5.9"
+	String VER_SCALAFMT="3.6.1"
 	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:$VER_SCALAFMT"
 
 	String VER_DIKTAT = "1.2.3"

diff --git a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
@@ -34,7 +34,7 @@ public class ScalaFmtStep {
 	// prevent direct instantiation
 	private ScalaFmtStep() {}
 
-	private static final String DEFAULT_VERSION = "3.5.9";
+	private static final String DEFAULT_VERSION = "3.6.1";
 
 	private static final String DEFAULT_SCALA_MAJOR_VERSION = "2.13";
 	static final String NAME = "scalafmt";

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
@@ -10,6 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
 ### Changes
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
+* Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
 
 ## [6.11.0] - 2022-09-14
 ### Added

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
@@ -10,6 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
 ### Changes
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
+* Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
 
 ## [2.27.2] - 2022-10-10
 ### Fixed

diff --git a/testlib/src/main/resources/scala/scalafmt/scalafmt.conf b/testlib/src/main/resources/scala/scalafmt/scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.5.9
+version = 3.6.1
 runner.dialect = scala213
 style = defaultWithAlign # For pretty alignment.
 maxColumn = 20           # For my teensy narrow display