Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for new eclipse versions #215

Merged
merged 6 commits into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Goomph releases

## [Unreleased]
### Added
- 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
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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;
Expand Down Expand Up @@ -93,7 +92,7 @@ protected FileSignature calculateState() throws Exception {
throw Unhandled.classException(o);
}
}
return FileSignature.signAsList(files);
return FileSignature.from(files);
}

/** Returns the files which were resolved. */
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/com/diffplug/gradle/pde/EclipseRelease.java
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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":
Expand All @@ -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;
}
Expand Down
Loading