diff --git a/CHANGES.md b/CHANGES.md index 8b821b3d2e..f25afca80e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -14,7 +14,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * **BREAKING** Bump the required Java to `17`. ([#2375](https://github.com/diffplug/spotless/issues/2375), [#2540](https://github.com/diffplug/spotless/pull/2540)) * Bump JGit from `6.10.1` to `7.3.0` ([#2257](https://github.com/diffplug/spotless/pull/2257)) * Adds support for worktrees (fixes [#1765](https://github.com/diffplug/spotless/issues/1765)) - * Should improve the search for system-global git config. * Bump default `google-java-format` version to latest `1.24.0` -> `1.28.0`. ([#2345](https://github.com/diffplug/spotless/pull/2345)) ## [3.3.1] - 2025-07-21 diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle index a4749cc859..b5e1f68a23 100644 --- a/lib-extra/build.gradle +++ b/lib-extra/build.gradle @@ -77,12 +77,10 @@ tasks.withType(Test).configureEach { apply plugin: 'dev.equo.p2deps' p2deps { - if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) { - into 'cdtCompileOnly', { - p2repo 'https://download.eclipse.org/eclipse/updates/4.26/' - p2repo 'https://download.eclipse.org/tools/cdt/releases/11.0/' - install 'org.eclipse.cdt.core' - } + into 'cdtCompileOnly', { + p2repo 'https://download.eclipse.org/eclipse/updates/4.26/' + p2repo 'https://download.eclipse.org/tools/cdt/releases/11.0/' + install 'org.eclipse.cdt.core' } into 'groovyCompileOnly', { p2repo 'https://download.eclipse.org/eclipse/updates/4.26/' diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java index 85d8416c0b..2695068e5b 100644 --- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java +++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java @@ -192,8 +192,10 @@ static class RuntimeInit { ///////////////////////////////// // USER AND SYSTEM-WIDE VALUES // ///////////////////////////////// - FS.DETECTED.setGitSystemConfig(new File("no-global-git-config-for-spotless")); // this fixes a problem - // that was only occurring on Java 11. If we remove support for Java 11, we could probably remove it. + FS.DETECTED.setGitSystemConfig(new File("no-global-git-config-for-spotless")); + // ^^^ fixes a problem that was only occurring on Java 11. If we remove support for Java 11, we could probably remove it. + // EDIT: Wrong, when Java 17 became the baseline it only happens on Java 17. https://github.com/diffplug/spotless/issues/2375#issuecomment-2573885902 + systemConfig = SystemReader.getInstance().openSystemConfig(null, FS.DETECTED); Errors.log().run(systemConfig::load); userConfig = SystemReader.getInstance().openUserConfig(systemConfig, FS.DETECTED); diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 8b4ff0777d..8fa7012e0d 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -7,7 +7,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * **BREAKING** Bump the required Gradle to `7.3` and required Java to `17`. ([#2375](https://github.com/diffplug/spotless/issues/2375), [#2540](https://github.com/diffplug/spotless/pull/2540)) * Bump JGit from `6.10.1` to `7.3.0` ([#2257](https://github.com/diffplug/spotless/pull/2257)) * Adds support for worktrees (fixes [#1765](https://github.com/diffplug/spotless/issues/1765)) - * Should improve the search for system-global git config. * Bump default `google-java-format` version to latest `1.24.0` -> `1.28.0`. ([#2345](https://github.com/diffplug/spotless/pull/2345)) ## [7.2.1] - 2025-07-21 diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md index 0c9c2526b7..fdefbe9a72 100644 --- a/plugin-gradle/README.md +++ b/plugin-gradle/README.md @@ -137,10 +137,11 @@ All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.dif ### Requirements -Spotless requires JRE 11+ and Gradle 6.1.1 or newer. +Spotless requires JRE 17+ and Gradle 7.3 or newer. +- If you're stuck on JRE 11, use [`id 'com.diffplug.spotless' version '7.2.1'` or older](https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md#721---2025-07-21). - If you're stuck on JRE 8, use [`id 'com.diffplug.spotless' version '6.13.0'` or older](https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md#6130---2023-01-14). -- If you're stuck on an older version of Gradle, [`id 'com.diffplug.gradle.spotless' version '4.5.1'` supports all the way back to Gradle 2.x](https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md#451---2020-07-04). +- If you're stuck on a very old version of Gradle, [`id 'com.diffplug.gradle.spotless' version '4.5.1'` supports all the way back to Gradle 2.x](https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md#451---2020-07-04). ### Git hook diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index ceaf0edcfe..1803169e8a 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -7,7 +7,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * **BREAKING** Bump the required Java to `17`. ([#2375](https://github.com/diffplug/spotless/issues/2375), [#2540](https://github.com/diffplug/spotless/pull/2540)) * Bump JGit from `6.10.1` to `7.3.0` ([#2257](https://github.com/diffplug/spotless/pull/2257)) * Adds support for worktrees (fixes [#1765](https://github.com/diffplug/spotless/issues/1765)) - * Should improve the search for system-global git config. * Bump default `google-java-format` version to latest `1.24.0` -> `1.28.0`. ([#2345](https://github.com/diffplug/spotless/pull/2345)) ## [2.46.1] - 2025-07-21 diff --git a/plugin-maven/README.md b/plugin-maven/README.md index d0c658d40c..f6a1a73c26 100644 --- a/plugin-maven/README.md +++ b/plugin-maven/README.md @@ -144,8 +144,10 @@ Spotless consists of a list of formats (in the example above, `misc` and `java`) ### Requirements -Spotless requires Maven to be running on JRE 11+. To use JRE 8, go back to [`2.30.0` or older](https://github.com/diffplug/spotless/blob/main/plugin-maven/CHANGES.md#2300---2023-01-13). +Spotless requires Maven to be running on JRE 17+. +- If you're stuck on JRE 11, use [`2.46.1`](https://github.com/diffplug/spotless/blob/main/plugin-maven/CHANGES.md#2461---2025-07-21). +- If you're stuck on JRE 8, go back to [`2.30.0` or older](https://github.com/diffplug/spotless/blob/main/plugin-maven/CHANGES.md#2300---2023-01-13). ### Git hook