diff --git a/build.gradle b/build.gradle index ae421a78..be4b8bac 100644 --- a/build.gradle +++ b/build.gradle @@ -55,6 +55,7 @@ configurations.compileClasspath { transitive = false } eclipseMavenCentral { + silenceEquoIDE() release VER_P2_BOOTSTRAP, { api 'org.eclipse.osgi' api 'org.eclipse.osgi.compatibility.state' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832..ccebba77 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f72df95a..c44c2304 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/gradlew b/gradlew index a69d9cb6..79a61d42 100755 --- a/gradlew +++ b/gradlew @@ -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/. @@ -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"' @@ -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 diff --git a/gradlew.bat b/gradlew.bat index 53a6b238..6689b85b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -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% diff --git a/settings.gradle b/settings.gradle index e83da088..3e7355e9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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' diff --git a/src/main/java/com/diffplug/gradle/pde/EclipseRelease.java b/src/main/java/com/diffplug/gradle/pde/EclipseRelease.java index c82c6cab..1d37437d 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.32.0"; + public static final String LATEST = "4.33.0"; public static EclipseRelease latestOfficial() { return official(LATEST); @@ -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": @@ -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; }