Skip to content

Commit c5d7d63

Browse files
authored
Add support for new eclipse versions (#215)
2 parents 80ebe21 + ab55704 commit c5d7d63

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

CHANGES.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# Goomph releases
22

33
## [Unreleased]
4+
### Added
5+
- Add support for latest Eclipse versions. ([#215](https://github.com/diffplug/goomph/pull/215))
6+
- Eclipse `4.31.0` aka `2024-03` ([new and noteworthy](https://eclipse.dev/eclipse/news/4.31/))
7+
- Eclipse `4.32.0` aka `2024-06` ([new and noteworthy](https://eclipse.dev/eclipse/news/4.32/))
8+
- **BREAKING** Updated spotless dependency to be compatible with spotless-plugin-gradle 7.x.
49

510
## [3.44.0] - 2023-12-08
611
### Added

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ dependencies {
4040
implementation "com.diffplug.durian:durian-collect:${VER_DURIAN}"
4141
implementation "com.diffplug.durian:durian-io:${VER_DURIAN}"
4242
implementation "com.diffplug.durian:durian-swt.os:${VER_DURIAN_SWT}"
43-
implementation "commons-io:commons-io:2.15.1"
44-
implementation "com.diffplug.spotless:spotless-lib:2.34.0"
43+
implementation "commons-io:commons-io:2.16.1"
44+
implementation "com.diffplug.spotless:spotless-lib:3.0.0.RC2"
4545
implementation "com.squareup.okhttp3:okhttp:4.12.0"
46-
implementation "com.squareup.okio:okio:3.6.0"
46+
implementation "com.squareup.okio:okio:3.9.0"
4747
// OSGi
4848
implementation "biz.aQute.bnd:biz.aQute.bndlib:${VER_BNDLIB}"
4949
// testing
5050
testImplementation "junit:junit:4.13.2"
51-
testImplementation "org.assertj:assertj-core:3.24.2"
51+
testImplementation "org.assertj:assertj-core:3.26.0"
5252
}
5353

5454
configurations.compileClasspath {

src/main/java/com/diffplug/gradle/eclipserunner/EquinoxLaunchSource.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2017-2019 DiffPlug
2+
* Copyright (C) 2017-2024 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
1515
*/
1616
package com.diffplug.gradle.eclipserunner;
1717

18-
1918
import com.diffplug.common.base.Unhandled;
2019
import com.diffplug.spotless.FileSignature;
2120
import com.diffplug.spotless.LazyForwardingEquality;
@@ -93,7 +92,7 @@ protected FileSignature calculateState() throws Exception {
9392
throw Unhandled.classException(o);
9493
}
9594
}
96-
return FileSignature.signAsList(files);
95+
return FileSignature.from(files);
9796
}
9897

9998
/** Returns the files which were resolved. */

src/main/java/com/diffplug/gradle/pde/EclipseRelease.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2015-2023 DiffPlug
2+
* Copyright (C) 2015-2024 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -58,7 +58,7 @@ public static EclipseRelease official(String version) {
5858
}
5959
}
6060

61-
public static final String LATEST = "4.30.0";
61+
public static final String LATEST = "4.32.0";
6262

6363
public static EclipseRelease latestOfficial() {
6464
return official(LATEST);
@@ -132,6 +132,8 @@ private static EclipseRelease officialReleaseMaybe(String version) {
132132
case "4.28.0": return root + "4.28/R-4.28-202306050440/";
133133
case "4.29.0": return root + "4.29/R-4.29-202309031000/";
134134
case "4.30.0": return root + "4.30/R-4.30-202312010110/";
135+
case "4.31.0": return root + "4.31/R-4.31-202402290520/";
136+
case "4.32.0": return root + "4.32/R-4.32-202406010610/";
135137
// less-specific versions
136138
case "3.5": case "3.6": case "3.7": case "3.8":
137139
case "4.2": case "4.3": case "4.4": case "4.5":
@@ -141,7 +143,7 @@ private static EclipseRelease officialReleaseMaybe(String version) {
141143
case "4.18": case "4.19": case "4.20": case "4.21":
142144
case "4.22": case "4.23": case "4.24": case "4.25":
143145
case "4.26": case "4.27": case "4.28": case "4.29":
144-
case "4.30":
146+
case "4.30": case "4.31": case "4.32":
145147
return root + v + "/";
146148
default: return null;
147149
}

0 commit comments

Comments
 (0)