From 1fc190cbebaefbc8400c8787d3113d43b1e5015e Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Wed, 3 Jul 2024 17:36:40 -0700 Subject: [PATCH 1/6] Update changelog. --- CHANGES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 8d0be313..bbd5703b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,9 @@ # Goomph releases ## [Unreleased] +### Added +- Eclipse `4.31.0` aka `2024-03` ([new and noteworthy](https://eclipse.dev/eclipse/news/4.31/)) +- Eclipse `4.32.0` aka `2024-06` ([new and noteworthy](https://eclipse.dev/eclipse/news/4.32/)) ## [3.44.0] - 2023-12-08 ### Added From 303d1fb2953ebc60031320e2665ea91a57c209b5 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Wed, 3 Jul 2024 17:37:03 -0700 Subject: [PATCH 2/6] Add two eclipse releases. --- src/main/java/com/diffplug/gradle/pde/EclipseRelease.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/diffplug/gradle/pde/EclipseRelease.java b/src/main/java/com/diffplug/gradle/pde/EclipseRelease.java index 9798b5de..95bab121 100644 --- a/src/main/java/com/diffplug/gradle/pde/EclipseRelease.java +++ b/src/main/java/com/diffplug/gradle/pde/EclipseRelease.java @@ -58,7 +58,7 @@ public static EclipseRelease official(String version) { } } - public static final String LATEST = "4.30.0"; + public static final String LATEST = "4.32.0"; public static EclipseRelease latestOfficial() { return official(LATEST); @@ -132,6 +132,8 @@ private static EclipseRelease officialReleaseMaybe(String version) { case "4.28.0": return root + "4.28/R-4.28-202306050440/"; case "4.29.0": return root + "4.29/R-4.29-202309031000/"; case "4.30.0": return root + "4.30/R-4.30-202312010110/"; + case "4.31.0": return root + "4.31/R-4.31-202402290520/"; + case "4.32.0": return root + "4.32/R-4.32-202406010610/"; // less-specific versions case "3.5": case "3.6": case "3.7": case "3.8": case "4.2": case "4.3": case "4.4": case "4.5": @@ -141,7 +143,7 @@ private static EclipseRelease officialReleaseMaybe(String version) { case "4.18": case "4.19": case "4.20": case "4.21": case "4.22": case "4.23": case "4.24": case "4.25": case "4.26": case "4.27": case "4.28": case "4.29": - case "4.30": + case "4.30": case "4.31": case "4.32": return root + v + "/"; default: return null; } From 3480c5e5e61f662a0d5092085564d226eff3146a Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Wed, 3 Jul 2024 17:37:20 -0700 Subject: [PATCH 3/6] Update a few dependencies. --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index e0d1f022..e3219281 100644 --- a/build.gradle +++ b/build.gradle @@ -40,15 +40,15 @@ dependencies { implementation "com.diffplug.durian:durian-collect:${VER_DURIAN}" implementation "com.diffplug.durian:durian-io:${VER_DURIAN}" implementation "com.diffplug.durian:durian-swt.os:${VER_DURIAN_SWT}" - implementation "commons-io:commons-io:2.15.1" - implementation "com.diffplug.spotless:spotless-lib:2.34.0" + implementation "commons-io:commons-io:2.16.1" + implementation "com.diffplug.spotless:spotless-lib:3.0.0.RC2" implementation "com.squareup.okhttp3:okhttp:4.12.0" - implementation "com.squareup.okio:okio:3.6.0" + implementation "com.squareup.okio:okio:3.9.0" // OSGi implementation "biz.aQute.bnd:biz.aQute.bndlib:${VER_BNDLIB}" // testing testImplementation "junit:junit:4.13.2" - testImplementation "org.assertj:assertj-core:3.24.2" + testImplementation "org.assertj:assertj-core:3.26.0" } configurations.compileClasspath { From d1d8832f461e4ddc7a0825ccb0b802111e71e030 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Wed, 3 Jul 2024 17:41:24 -0700 Subject: [PATCH 4/6] Update for spotless-lib 3.0 --- .../com/diffplug/gradle/eclipserunner/EquinoxLaunchSource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/diffplug/gradle/eclipserunner/EquinoxLaunchSource.java b/src/main/java/com/diffplug/gradle/eclipserunner/EquinoxLaunchSource.java index 00fb544f..0e539ac9 100644 --- a/src/main/java/com/diffplug/gradle/eclipserunner/EquinoxLaunchSource.java +++ b/src/main/java/com/diffplug/gradle/eclipserunner/EquinoxLaunchSource.java @@ -93,7 +93,7 @@ protected FileSignature calculateState() throws Exception { throw Unhandled.classException(o); } } - return FileSignature.signAsList(files); + return FileSignature.from(files); } /** Returns the files which were resolved. */ From 98b85869b6adfe6882aeea94a567e5c6256035a8 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Wed, 3 Jul 2024 17:44:09 -0700 Subject: [PATCH 5/6] Update changelog. --- CHANGES.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index bbd5703b..3dcf77be 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,8 +2,10 @@ ## [Unreleased] ### Added -- Eclipse `4.31.0` aka `2024-03` ([new and noteworthy](https://eclipse.dev/eclipse/news/4.31/)) -- Eclipse `4.32.0` aka `2024-06` ([new and noteworthy](https://eclipse.dev/eclipse/news/4.32/)) +- Add support for latest Eclipse versions. ([#215](https://github.com/diffplug/goomph/pull/215)) + - Eclipse `4.31.0` aka `2024-03` ([new and noteworthy](https://eclipse.dev/eclipse/news/4.31/)) + - Eclipse `4.32.0` aka `2024-06` ([new and noteworthy](https://eclipse.dev/eclipse/news/4.32/)) + - **BREAKING** Updated spotless dependency to be compatible with spotless-plugin-gradle 7.x. ## [3.44.0] - 2023-12-08 ### Added From ab5570464814513ef49ef62bc6d07203d31e4591 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Wed, 3 Jul 2024 17:44:57 -0700 Subject: [PATCH 6/6] spotlessApply --- .../com/diffplug/gradle/eclipserunner/EquinoxLaunchSource.java | 3 +-- src/main/java/com/diffplug/gradle/pde/EclipseRelease.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/diffplug/gradle/eclipserunner/EquinoxLaunchSource.java b/src/main/java/com/diffplug/gradle/eclipserunner/EquinoxLaunchSource.java index 0e539ac9..efb4e753 100644 --- a/src/main/java/com/diffplug/gradle/eclipserunner/EquinoxLaunchSource.java +++ b/src/main/java/com/diffplug/gradle/eclipserunner/EquinoxLaunchSource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 DiffPlug + * Copyright (C) 2017-2024 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,6 @@ */ package com.diffplug.gradle.eclipserunner; - import com.diffplug.common.base.Unhandled; import com.diffplug.spotless.FileSignature; import com.diffplug.spotless.LazyForwardingEquality; diff --git a/src/main/java/com/diffplug/gradle/pde/EclipseRelease.java b/src/main/java/com/diffplug/gradle/pde/EclipseRelease.java index 95bab121..c82c6cab 100644 --- a/src/main/java/com/diffplug/gradle/pde/EclipseRelease.java +++ b/src/main/java/com/diffplug/gradle/pde/EclipseRelease.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2023 DiffPlug + * Copyright (C) 2015-2024 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.