Skip to content

Commit

Permalink
Add support for latest eclipse (#216)
Browse files Browse the repository at this point in the history
  • Loading branch information
nedtwigg authored Sep 20, 2024
2 parents 083c04a + afe715d commit 8926027
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 14 deletions.
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ configurations.compileClasspath {
transitive = false
}
eclipseMavenCentral {
silenceEquoIDE()
release VER_P2_BOOTSTRAP, {
api 'org.eclipse.osgi'
api 'org.eclipse.osgi.compatibility.state'
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
12 changes: 8 additions & 4 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,10 +80,10 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

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

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
Expand Down Expand Up @@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down
1 change: 1 addition & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand Down
14 changes: 7 additions & 7 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@ plugins {
// https://github.com/diffplug/blowdryer/blob/main/CHANGELOG.md
id 'com.diffplug.blowdryerSetup' version '1.7.1'
// https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md
id 'com.diffplug.spotless' version '7.0.0.BETA1' apply false
id 'com.diffplug.spotless' version '7.0.0.BETA2' apply false
// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
id 'com.gradle.plugin-publish' version '1.2.1' apply false
id 'com.gradle.plugin-publish' version '1.2.2' apply false
// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
id 'dev.equo.ide' version '1.7.6' apply false
id 'dev.equo.ide' version '1.7.7' apply false
// https://github.com/gradle-nexus/publish-plugin/releases
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
// dogfood
id 'com.diffplug.eclipse.mavencentral' version '3.40.0' apply false
id 'com.diffplug.configuration-cache-for-platform-specific-build' version '4.0.1'
}
blowdryerSetup {
github 'diffplug/blowdryer-diffplug', 'tag', '7.3.0'
github 'diffplug/blowdryer-diffplug', 'tag', '8.0.2'
//devLocal '../blowdryer-diffplug'
setPluginsBlockTo {
it.file 'plugin.versions'
it.add("\t// dogfood");
it.add("\tid 'com.diffplug.eclipse.mavencentral' version '3.40.0' apply false")
it.add("\tid 'com.diffplug.configuration-cache-for-platform-specific-build' version '4.0.1'")
}
}
rootProject.name = 'goomph'
5 changes: 3 additions & 2 deletions src/main/java/com/diffplug/gradle/pde/EclipseRelease.java
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public static EclipseRelease official(String version) {
}
}

public static final String LATEST = "4.32.0";
public static final String LATEST = "4.33.0";

public static EclipseRelease latestOfficial() {
return official(LATEST);
Expand Down Expand Up @@ -134,6 +134,7 @@ private static EclipseRelease officialReleaseMaybe(String version) {
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/";
case "4.33.0": return root + "4.33/R-4.33-202409030240/";
// 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 @@ -143,7 +144,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.31": case "4.32":
case "4.30": case "4.31": case "4.32": case "4.33":
return root + v + "/";
default: return null;
}
Expand Down

0 comments on commit 8926027

Please sign in to comment.