Fix eclipse-based parallel downloads (#2396 fixes #2389)

nedtwigg · web-flow · commit b8b4efcd5f5c · 2025-01-14T12:57:23.000-08:00
diff --git 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
@@ -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
@@ -10,7 +10,7 @@ Action<FreshMarkExtension> 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
@@ -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
@@ -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<File>();
 			var mavenDeps = new ArrayList<String>();
-			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
@@ -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
@@ -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
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ spotless {`
`22`	`22`	`}`
`23`	`23`	`format 'dotfiles', {`
`24`	`24`	`target '.gitignore', '.gitattributes', '.editorconfig'`
`25`		`- indentWithSpaces(2)`
	`25`	`+ leadingTabsToSpaces(2)`
`26`	`26`	`trimTrailingWhitespace()`
`27`	`27`	`endWithNewline()`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ Action<FreshMarkExtension> freshmarkSetup = {`
`10`	`10`	`it.put('yes', ':+1:')`
`11`	`11`	`it.put('no', ':white_large_square:')`
`12`	`12`	`}`
`13`		`- it.indentWithSpaces(2)`
	`13`	`+ it.leadingTabsToSpaces(2)`
`14`	`14`	`it.endWithNewline()`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ plugins {`
`22`	`22`	`// https://plugins.gradle.org/plugin/com.gradle.develocity`
`23`	`23`	`id 'com.gradle.develocity' version '3.19'`
`24`	`24`	`// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md`
`25`		`- id 'dev.equo.ide' version '1.7.7' apply false`
	`25`	`+ id 'dev.equo.ide' version '1.7.8' apply false`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`dependencyResolutionManagement {`