Skip to content

Commit 8926027

Browse files
authored
Add support for latest eclipse (#216)
2 parents 083c04a + afe715d commit 8926027

File tree

7 files changed

+22
-14
lines changed

7 files changed

+22
-14
lines changed

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ configurations.compileClasspath {
5555
transitive = false
5656
}
5757
eclipseMavenCentral {
58+
silenceEquoIDE()
5859
release VER_P2_BOOTSTRAP, {
5960
api 'org.eclipse.osgi'
6061
api 'org.eclipse.osgi.compatibility.state'

gradle/wrapper/gradle-wrapper.jar

852 Bytes
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

gradlew

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
8080
esac
8181
done
8282

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
83+
# This is normally unused
84+
# shellcheck disable=SC2034
8685
APP_BASE_NAME=${0##*/}
86+
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8787

8888
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
8989
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
143143
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144144
case $MAX_FD in #(
145145
max*)
146+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147+
# shellcheck disable=SC3045
146148
MAX_FD=$( ulimit -H -n ) ||
147149
warn "Could not query maximum file descriptor limit"
148150
esac
149151
case $MAX_FD in #(
150152
'' | soft) :;; #(
151153
*)
154+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155+
# shellcheck disable=SC3045
152156
ulimit -n "$MAX_FD" ||
153157
warn "Could not set maximum file descriptor limit to $MAX_FD"
154158
esac

gradlew.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
2828
if "%DIRNAME%"=="" set DIRNAME=.
29+
@rem This is normally unused
2930
set APP_BASE_NAME=%~n0
3031
set APP_HOME=%DIRNAME%
3132

settings.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@ plugins {
88
// https://github.com/diffplug/blowdryer/blob/main/CHANGELOG.md
99
id 'com.diffplug.blowdryerSetup' version '1.7.1'
1010
// https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md
11-
id 'com.diffplug.spotless' version '7.0.0.BETA1' apply false
11+
id 'com.diffplug.spotless' version '7.0.0.BETA2' apply false
1212
// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
13-
id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
13+
id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
1414
// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
15-
id 'com.gradle.plugin-publish' version '1.2.1' apply false
15+
id 'com.gradle.plugin-publish' version '1.2.2' apply false
1616
// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
17-
id 'dev.equo.ide' version '1.7.6' apply false
17+
id 'dev.equo.ide' version '1.7.7' apply false
1818
// https://github.com/gradle-nexus/publish-plugin/releases
1919
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
2020
// dogfood
21-
id 'com.diffplug.eclipse.mavencentral' version '3.40.0' apply false
21+
id 'com.diffplug.configuration-cache-for-platform-specific-build' version '4.0.1'
2222
}
2323
blowdryerSetup {
24-
github 'diffplug/blowdryer-diffplug', 'tag', '7.3.0'
24+
github 'diffplug/blowdryer-diffplug', 'tag', '8.0.2'
2525
//devLocal '../blowdryer-diffplug'
2626
setPluginsBlockTo {
2727
it.file 'plugin.versions'
2828
it.add("\t// dogfood");
29-
it.add("\tid 'com.diffplug.eclipse.mavencentral' version '3.40.0' apply false")
29+
it.add("\tid 'com.diffplug.configuration-cache-for-platform-specific-build' version '4.0.1'")
3030
}
3131
}
3232
rootProject.name = 'goomph'

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static EclipseRelease official(String version) {
5858
}
5959
}
6060

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

6363
public static EclipseRelease latestOfficial() {
6464
return official(LATEST);
@@ -134,6 +134,7 @@ private static EclipseRelease officialReleaseMaybe(String version) {
134134
case "4.30.0": return root + "4.30/R-4.30-202312010110/";
135135
case "4.31.0": return root + "4.31/R-4.31-202402290520/";
136136
case "4.32.0": return root + "4.32/R-4.32-202406010610/";
137+
case "4.33.0": return root + "4.33/R-4.33-202409030240/";
137138
// less-specific versions
138139
case "3.5": case "3.6": case "3.7": case "3.8":
139140
case "4.2": case "4.3": case "4.4": case "4.5":
@@ -143,7 +144,7 @@ private static EclipseRelease officialReleaseMaybe(String version) {
143144
case "4.18": case "4.19": case "4.20": case "4.21":
144145
case "4.22": case "4.23": case "4.24": case "4.25":
145146
case "4.26": case "4.27": case "4.28": case "4.29":
146-
case "4.30": case "4.31": case "4.32":
147+
case "4.30": case "4.31": case "4.32": case "4.33":
147148
return root + v + "/";
148149
default: return null;
149150
}

0 commit comments

Comments
 (0)