From 77c480e8844ceb44e8801ffff67553b4adb161f5 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Tue, 14 Jan 2025 12:39:38 -0800 Subject: [PATCH] Bump equo versions to latest, which fixes parallel downloads. --- lib-extra/build.gradle | 2 +- .../com/diffplug/spotless/extra/EquoBasedStepBuilder.java | 6 +++--- settings.gradle | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) 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/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 {