Skip to content

Commit 5e4da27

Browse files
dayanrubenGoooler
authored andcommitted
Bump ktfmt to 0.61 and fix rewriteDryRun
1 parent f0d9454 commit 5e4da27

File tree

6 files changed

+7
-4
lines changed

6 files changed

+7
-4
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
1313
### Added
1414
- Add the ability to specify a wildcard version (`*`) for external formatter executables. ([#2757](https://github.com/diffplug/spotless/issues/2757))
1515
### Changes
16+
* Bump default `ktfmt` version to latest `0.59` -> `0.61`. ([2804](https://github.com/diffplug/spotless/pull/2804))
1617
* Bump default `ktlint` version to latest `1.7.1` -> `1.8.0`. ([2763](https://github.com/diffplug/spotless/pull/2763))
1718
* Bump default `gherkin-utils` version to latest `9.2.0` -> `10.0.0`. ([#2619](https://github.com/diffplug/spotless/pull/2619))
1819

lib/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,13 @@ dependencies {
101101
jacksonCompileOnly "com.fasterxml.jackson.core:jackson-databind:$VER_JACKSON"
102102
jacksonCompileOnly "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$VER_JACKSON"
103103
// ktfmt
104-
ktfmtCompileOnly "com.facebook:ktfmt:0.59"
104+
ktfmtCompileOnly "com.facebook:ktfmt:0.61"
105105
ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {
106106
version {
107107
strictly '1.7' // for JDK 8 compatibility
108108
}
109109
}
110+
ktfmtCompileOnly "com.google.code.findbugs:jsr305:${VER_JSR_305}"
110111
// ktlint latest supported version
111112
compatKtLint1Dot0Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-rule-engine:1.8.0'
112113
compatKtLint1Dot0Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:1.8.0'

lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2025 DiffPlug
2+
* Copyright 2016-2026 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@
4141
public final class KtfmtStep implements Serializable {
4242
@Serial
4343
private static final long serialVersionUID = 1L;
44-
private static final String DEFAULT_VERSION = "0.59";
44+
private static final String DEFAULT_VERSION = "0.61";
4545
private static final String NAME = "ktfmt";
4646
private static final String MAVEN_COORDINATE = "com.facebook:ktfmt:";
4747

plugin-gradle/CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
88
### Fixed
99
- [fix] `NPE` due to workingTreeIterator being null for git ignored files. #911 ([#2771](https://github.com/diffplug/spotless/issues/2771))
1010
### Changes
11+
* Bump default `ktfmt` version to latest `0.59` -> `0.61`. ([2804](https://github.com/diffplug/spotless/pull/2804))
1112
* Bump default `ktlint` version to latest `1.7.1` -> `1.8.0`. ([2763](https://github.com/diffplug/spotless/pull/2763))
1213
* Bump default `gherkin-utils` version to latest `9.2.0` -> `10.0.0`. ([#2619](https://github.com/diffplug/spotless/pull/2619))
1314

plugin-maven/CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
88
### Fixed
99
- [fix] `NPE` due to workingTreeIterator being null for git ignored files. #911 ([#2771](https://github.com/diffplug/spotless/issues/2771))
1010
### Changes
11+
* Bump default `ktfmt` version to latest `0.59` -> `0.61`. ([2804](https://github.com/diffplug/spotless/pull/2804))
1112
* Bump default `ktlint` version to latest `1.7.1` -> `1.8.0`. ([2763](https://github.com/diffplug/spotless/pull/2763))
1213
* Bump default `gherkin-utils` version to latest `9.2.0` -> `10.0.0`. ([#2619](https://github.com/diffplug/spotless/pull/2619))
1314

rewrite.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ recipeList:
1818
- org.openrewrite.java.format.RemoveTrailingWhitespace
1919
- org.openrewrite.java.migrate.UpgradeToJava17
2020
- org.openrewrite.java.migrate.lang.StringRulesRecipes
21-
- org.openrewrite.java.migrate.util.JavaLangAPIs
2221
- org.openrewrite.java.migrate.util.JavaUtilAPIs
2322
- org.openrewrite.java.migrate.util.MigrateInflaterDeflaterToClose
2423
- org.openrewrite.java.migrate.util.ReplaceStreamCollectWithToList

0 commit comments

Comments
 (0)