Skip to content

Commit 864ddc8

Browse files
authored
Merge branch 'main' into sort-members
2 parents e0306b3 + 1769779 commit 864ddc8

File tree

7 files changed

+11
-5
lines changed

7 files changed

+11
-5
lines changed

CHANGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
1313
### Changed
1414
* Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
1515
* Add _Sort Members_ feature based on [Eclipse JDT](plugin-gradle/README.md#eclipse-jdt) implementation. ([#2312](https://github.com/diffplug/spotless/pull/2312))
16+
* Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))
17+
* Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320)
1618

1719
## [3.0.0.BETA4] - 2024-10-24
1820
### Added

lib/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ dependencies {
9797
// gson
9898
gsonCompileOnly 'com.google.code.gson:gson:2.11.0'
9999
// jackson
100-
String VER_JACKSON='2.18.0'
100+
String VER_JACKSON='2.18.1'
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.52"
104+
ktfmtCompileOnly "com.facebook:ktfmt:0.53"
105105
ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {
106106
version {
107107
strictly '1.7' // for JDK 8 compatibility

lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
public class JacksonJsonStep implements Serializable {
3333
private static final long serialVersionUID = 1L;
3434
private static final String MAVEN_COORDINATE = "com.fasterxml.jackson.core:jackson-databind:";
35-
private static final String DEFAULT_VERSION = "2.18.0";
35+
private static final String DEFAULT_VERSION = "2.18.1";
3636
public static final String NAME = "jacksonJson";
3737

3838
private final JarState.Promised jarState;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
*/
4040
public class KtfmtStep implements Serializable {
4141
private static final long serialVersionUID = 1L;
42-
private static final String DEFAULT_VERSION = "0.52";
42+
private static final String DEFAULT_VERSION = "0.53";
4343
private static final String NAME = "ktfmt";
4444
private static final String MAVEN_COORDINATE = "com.facebook:ktfmt:";
4545

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
### Changed
77
* Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
8+
* Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))
9+
* Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320)
810

911
## [7.0.0.BETA4] - 2024-10-24
1012
### Added

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
### Changed
77
* Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
8+
* Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))
9+
* Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320)
810

911
## [2.44.0.BETA4] - 2024-10-24
1012
### Added

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plugins {
1212
// https://github.com/gradle-nexus/publish-plugin/releases
1313
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
1414
// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
15-
id 'com.github.spotbugs' version '6.0.25' apply false
15+
id 'com.github.spotbugs' version '6.0.26' apply false
1616
// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
1717
id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
1818
// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

0 commit comments

Comments
 (0)