From b316ad0234f22e9b08ef9b180f89665e63358d43 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sat, 30 Sep 2023 02:43:12 +0800 Subject: [PATCH] Use palantir-java-format 2.38.0 on Java 21 Co-authored-by: Goooler --- CHANGES.md | 2 ++ .../com/diffplug/spotless/java/PalantirJavaFormatStep.java | 2 +- plugin-gradle/CHANGES.md | 4 ++++ plugin-maven/CHANGES.md | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index d5443669a0..f49010b0c8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,6 +10,8 @@ This document is intended for Spotless developers. We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`). ## [Unreleased] +### Changes +* Use palantir-java-format 2.38.0 on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920)) ## [2.43.0] - 2023-11-27 ### Added diff --git a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java index f769ad09ec..2c3b84c40d 100644 --- a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java +++ b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java @@ -30,7 +30,7 @@ private PalantirJavaFormatStep() {} private static final String DEFAULT_STYLE = "PALANTIR"; private static final String NAME = "palantir-java-format"; private static final String MAVEN_COORDINATE = "com.palantir.javaformat:palantir-java-format:"; - private static final Jvm.Support JVM_SUPPORT = Jvm. support(NAME).add(8, "1.1.0").add(11, "2.28.0"); + private static final Jvm.Support JVM_SUPPORT = Jvm. support(NAME).add(8, "1.1.0").add(11, "2.28.0").add(21, "2.38.0"); /** Creates a step which formats everything - code, import order, and unused imports. */ public static FormatterStep create(Provisioner provisioner) { diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 14e39cbae5..cd9f180f72 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -3,6 +3,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`). ## [Unreleased] +### Changes +* Use palantir-java-format 2.38.0 on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920)) + +## [6.23.2] - 2023-12-01 ### Fixed * Fix a stuck mavencentral sync from `6.23.1`. diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index 6313c8c8b5..9192df0540 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -3,6 +3,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`). ## [Unreleased] +### Changes +* Use palantir-java-format 2.38.0 on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920)) ## [2.41.0] - 2023-11-27 ### Added