diff --git a/CHANGES.md b/CHANGES.md index c714552607..3cda61bce4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( ## [Unreleased] ### Fixed * Node.JS-based tasks now work with the configuration cache ([#2372](https://github.com/diffplug/spotless/issues/2372)) +* Eclipse-based tasks can now handle parallel configuration ([#2389](https://github.com/diffplug/spotless/issues/2389)) ## [3.0.1] - 2025-01-07 ### Fixed diff --git a/build.gradle b/build.gradle index 0ae84bd9c4..fafd6abe43 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ spotless { } format 'dotfiles', { target '.gitignore', '.gitattributes', '.editorconfig' - indentWithSpaces(2) + leadingTabsToSpaces(2) trimTrailingWhitespace() endWithNewline() } diff --git a/gradle/spotless-freshmark.gradle b/gradle/spotless-freshmark.gradle index 54623eb05a..ddaedcfa3e 100644 --- a/gradle/spotless-freshmark.gradle +++ b/gradle/spotless-freshmark.gradle @@ -10,7 +10,7 @@ Action freshmarkSetup = { it.put('yes', ':+1:') it.put('no', ':white_large_square:') } - it.indentWithSpaces(2) + it.leadingTabsToSpaces(2) it.endWithNewline() } diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle index 5e056a8384..68862448b6 100644 --- a/lib-extra/build.gradle +++ b/lib-extra/build.gradle @@ -7,7 +7,7 @@ version = rootProject.spotlessChangelog.versionNext apply from: rootProject.file('gradle/java-setup.gradle') apply from: rootProject.file('gradle/java-publish.gradle') -String VER_SOLSTICE = '1.8.0' +String VER_SOLSTICE = '1.8.1' dependencies { api projects.lib // misc useful utilities diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java index df3824e9ca..fa68bc5391 100644 --- a/lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java +++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2024 DiffPlug + * Copyright 2016-2025 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -131,8 +131,8 @@ public FormatterStep build() { } var classpath = new ArrayList(); var mavenDeps = new ArrayList(); - mavenDeps.add("dev.equo.ide:solstice:1.8.0"); - mavenDeps.add("com.diffplug.durian:durian-swt.os:4.2.0"); + mavenDeps.add("dev.equo.ide:solstice:1.8.1"); + mavenDeps.add("com.diffplug.durian:durian-swt.os:4.3.1"); mavenDeps.addAll(query.getJarsOnMavenCentral()); classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps)); classpath.addAll(query.getJarsNotOnMavenCentral()); diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 077f18125d..84e6a72a95 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -4,7 +4,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( ## [Unreleased] ### Fixed - * Node.JS-based tasks now work with the configuration cache ([#2372](https://github.com/diffplug/spotless/issues/2372)) +* Node.JS-based tasks now work with the configuration cache ([#2372](https://github.com/diffplug/spotless/issues/2372)) +* Eclipse-based tasks can now handle parallel configuration ([#2389](https://github.com/diffplug/spotless/issues/2389)) ## [7.0.1] - 2025-01-07 ### Fixed diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index 8a3409e6c7..c4c6d57eb9 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -3,6 +3,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`). ## [Unreleased] +* Eclipse-based tasks can now handle parallel configuration ([#2389](https://github.com/diffplug/spotless/issues/2389)) ## [2.44.1] - 2025-01-07 ### Fixed diff --git a/settings.gradle b/settings.gradle index 76e667f42d..eb94d63dab 100644 --- a/settings.gradle +++ b/settings.gradle @@ -22,7 +22,7 @@ plugins { // https://plugins.gradle.org/plugin/com.gradle.develocity id 'com.gradle.develocity' version '3.19' // https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md - id 'dev.equo.ide' version '1.7.7' apply false + id 'dev.equo.ide' version '1.7.8' apply false } dependencyResolutionManagement {