Skip to content

Commit e4c928f

Browse files
authored
Merge branch 'main' into feat/wildcard-version-for-foreign-exe
2 parents 79f60c9 + 78cc9ed commit e4c928f

File tree

7 files changed

+20
-10
lines changed

7 files changed

+20
-10
lines changed

.github/renovate.json5

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,18 @@
33
"extends": [
44
"config:recommended",
55
],
6-
"packageRules": [
6+
packageRules: [
77
{
8-
"groupName": "Ktlint",
9-
"enabled": false,
10-
"matchPackageNames": [
11-
"/com.pinterest.ktlint:*/",
8+
groupName: 'Ktlint',
9+
matchPackageNames: [
10+
'com.pinterest.ktlint:*',
1211
]
13-
}
12+
},
13+
{
14+
groupName: 'OpenRewrite',
15+
matchPackageNames: [
16+
'org.openrewrite.recipe:*',
17+
],
18+
},
1419
]
1520
}

CHANGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
1212
## [Unreleased]
1313
### Added
1414
- Add the ability to specify a wildcard version (`*`) for external formatter executables. ([#2757](https://github.com/diffplug/spotless/issues/2757))
15+
### Changes
16+
- Bump default `ktlint` version to latest `1.7.1` -> `1.8.0`. ([2763](https://github.com/diffplug/spotless/pull/2763))
1517

1618
## [4.1.0] - 2025-11-18
1719
### Changes

gradle/rewrite.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ rewrite {
2121
failOnDryRunResults = true
2222
}
2323
dependencies {
24-
rewrite(platform('org.openrewrite.recipe:rewrite-recipe-bom:3.19.0'))
2524
rewrite('org.openrewrite.recipe:rewrite-migrate-java:3.22.0')
2625
rewrite('org.openrewrite.recipe:rewrite-java-security:3.22.0')
2726
rewrite('org.openrewrite.recipe:rewrite-rewrite:0.16.0')

lib/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ dependencies {
108108
}
109109
}
110110
// ktlint latest supported version
111-
compatKtLint1Dot0Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-rule-engine:1.0.0'
112-
compatKtLint1Dot0Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:1.0.0'
111+
compatKtLint1Dot0Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-rule-engine:1.8.0'
112+
compatKtLint1Dot0Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:1.8.0'
113113
compatKtLint1Dot0Dot0CompileAndTestOnly 'org.slf4j:slf4j-api:2.0.17'
114114
// palantirJavaFormat
115115
palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0' // this version needs to stay compilable against Java 8 for CI Job testNpm

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
public final class KtLintStep implements Serializable {
3939
@Serial
4040
private static final long serialVersionUID = 1L;
41-
private static final String DEFAULT_VERSION = "1.7.1";
41+
private static final String DEFAULT_VERSION = "1.8.0";
4242
private static final String NAME = "ktlint";
4343
private static final String MAVEN_COORDINATE_0_DOT = "com.pinterest:ktlint:";
4444
private static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";

plugin-gradle/CHANGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
55
## [Unreleased]
66
### Added
77
- Add the ability to specify a wildcard version (`*`) for external formatter executables. ([#2757](https://github.com/diffplug/spotless/issues/2757))
8+
### Changes
9+
- Bump default `ktlint` version to latest `1.7.1` -> `1.8.0`. ([2763](https://github.com/diffplug/spotless/pull/2763))
810

911
## [8.1.0] - 2025-11-18
1012
### Changes

plugin-maven/CHANGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
55
## [Unreleased]
66
### Added
77
- Add the ability to specify a wildcard version (`*`) for external formatter executables. ([#2757](https://github.com/diffplug/spotless/issues/2757))
8+
### Changes
9+
- Bump default `ktlint` version to latest `1.7.1` -> `1.8.0`. ([2763](https://github.com/diffplug/spotless/pull/2763))
810

911
## [3.1.0] - 2025-11-18
1012
### Changes

0 commit comments

Comments
 (0)