actions/gradle
1
0 Fork 0
mirror of https://github.com/gradle/actions.git synced 2026-10-28 19:57:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Combined dependency updates (#1105)

Browse Source 
Combines several open bot PRs into one:

- Bump Gradle Wrapper from 9.7.1 to 9.8.2 (squashed): closes #1098,
closes #1099, closes #1100, closes #1101, closes #1102
- Bump the github-actions group (`init-integ-test` action): closes #1096
- Bump references to Develocity Gradle plugin from 4.6.0 to 4.6.1:
closes #1103
- Bump the npm-dependencies group with 10 updates: closes #1097

Notes:
- `nock` moves from 14 to 15, a major version bump. Tests that intercept
HTTP requests are the most likely to break.
- Local `npm run build` (prettier + eslint + esbuild) passes under node
24.22.1. Locally, jest passed 490/491. The one failure is `fetches
wrapper jar checksums for snapshots`, which hits the live
services.gradle.org API and timed out at 60s on a slow connection. I
didn't check whether it also fails on `main`, so CI will settle it.

Also included:
- Switch the solutions Develocity server URL from
`ge.solutions-team.gradle.com` to `solutions.develocity.cloud`. The old
host now 308-redirects to the new one. `@actions/http-client` strips the
`Authorization` header on a cross-host redirect, so the short-lived
token request failed with a 401, which broke all the Develocity
injection integ tests.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: bot-githubaction <bot-githubaction@gradle.com>
This commit is contained in:
Daz DeBoerClaude Opus 5.5dependabot[bot]bot-githubaction
 authored and GitHub committed 2026-10-28 05:38:06 -06:00
1 parent 1cff18a4cf
commit 35eba4f16a
31 files changed
+440 -661
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

sources/develocity.config.cjs
+1 -1
View File
@@ -2,7 +2,7 @@ const { fromPropertiesFile, inGradleUserHome } = require('@gradle-tech/develocit
module.exports = {
server: {
url: 'https://ge.solutions-team.gradle.com/',
url: 'https://solutions.develocity.cloud/',
accessKey: fromPropertiesFile(inGradleUserHome())
},
}
sources/package-lock.json
Generated
+193 -564
View File
File diff suppressed because it is too large. Load diff
sources/package.json
+10 -10
View File
@@ -35,8 +35,8 @@
"node": ">=24.0.0"
},
"dependencies": {
"@actions/artifact": "6.2.1",
"@actions/cache": "6.2.0",
"@actions/artifact": "6.3.1",
"@actions/cache": "6.3.0",
"@actions/core": "3.0.1",
"@actions/exec": "3.0.0",
"@actions/github": "9.1.1",
@@ -45,26 +45,26 @@
"@actions/tool-cache": "4.0.0",
"@octokit/webhooks-types": "7.6.1",
"cheerio": "1.2.0",
"string-argv": "0.3.2",
"string-argv": "0.4.0",
"unhomoglyph": "1.0.6",
"which": "7.0.0"
},
"devDependencies": {
"@jest/globals": "30.4.1",
"@types/jest": "30.0.0",
"@types/node": "24.13.3",
"@types/node": "24.19.2",
"@types/unzipper": "0.10.11",
"@types/which": "3.0.4",
"@typescript-eslint/eslint-plugin": "8.69.0",
"@typescript-eslint/eslint-plugin": "8.72.0",
"dedent": "1.7.2",
"esbuild": "0.28.2",
"eslint": "10.10.0",
"globals": "17.12.0",
"eslint": "10.13.0",
"globals": "17.13.0",
"jest": "30.4.2",
"nock": "14.0.17",
"nock": "15.0.4",
"npm-run-all": "4.1.5",
"prettier": "3.9.6",
"ts-jest": "29.4.12",
"prettier": "3.9.10",
"ts-jest": "29.4.15",
"typescript": "6.0.3"
}
}
sources/src/develocity/build-scan.ts
+1 -1
View File
@@ -33,7 +33,7 @@ export function setup(config: DevelocityConfig): void {
// except if they are defined in the configuration
if (config.getBuildScanPublishEnabled()) {
maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true')
maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.6.0')
maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.6.1')
maybeExportVariable('DEVELOCITY_INJECTION_CCUD_PLUGIN_VERSION', '2.1')
maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_URL', config.getTermsOfUseUrl())
maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_AGREE', config.getTermsOfUseAgree())
sources/test/init-scripts/gradle/wrapper/gradle-wrapper.jar
Vendored
BIN
View File
Binary file not shown.
sources/test/init-scripts/gradle/wrapper/gradle-wrapper.properties
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=acd53f1edaf02f1a8ff99879f8a34b302661a057d9b063ae9e35b552f804d20a
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
distributionSha256Sum=21bd5da2de49b642904077f38c0efdc7778e92b3ed0889392dca61b97e389607
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.2-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
sources/test/init-scripts/gradlew.bat
Vendored
+41 -11
View File
@@ -26,6 +26,33 @@
@rem Set local scope for the variables, and ensure extensions are enabled
setlocal EnableExtensions
@rem Catch executions from older scripts and ensure they exit cleanly.
@rem This can be removed once we can be reasonably confident that few people
@rem will be migrating directly to this new wrapper.
goto afterSafetyNet
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
goto exitWithErrorLevel
:afterSafetyNet
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
@@ -45,13 +72,14 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
1>&2 echo.
1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
1>&2 echo.
1>&2 echo Please set the JAVA_HOME variable in your environment to match the
1>&2 echo location of your Java installation.
"%COMSPEC%" /c exit 1
goto exitWithErrorLevel
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
@@ -59,13 +87,14 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
1>&2 echo.
1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
1>&2 echo.
1>&2 echo Please set the JAVA_HOME variable in your environment to match the
1>&2 echo location of your Java installation.
"%COMSPEC%" /c exit 1
goto exitWithErrorLevel
:execute
@rem Setup the command line
@@ -75,8 +104,9 @@ echo location of your Java installation. 1>&2
@rem Execute gradlew
@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
@rem which allows us to clear the local environment before executing the java command
endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel & goto exitWithErrorLevel
@rem This label must not be changed. We rely on old scripts being able to jump to this point.
:exitWithErrorLevel
@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
"%COMSPEC%" /c exit %ERRORLEVEL%
sources/test/init-scripts/settings.gradle
+1 -1
View File
@@ -1,5 +1,5 @@
plugins {
id "com.gradle.develocity" version "4.6.0"
id "com.gradle.develocity" version "4.6.1"
id "com.gradle.common-custom-user-data-gradle-plugin" version "2.4.0"
}
sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy
+1 -1
View File
@@ -16,7 +16,7 @@ import java.nio.file.Files
import java.util.zip.GZIPOutputStream
class BaseInitScriptTest extends Specification {
static final String DEVELOCITY_PLUGIN_VERSION = '4.6.0'
static final String DEVELOCITY_PLUGIN_VERSION = '4.6.1'
static final String CCUD_PLUGIN_VERSION = '2.1'
static final TestGradleVersion GRADLE_4_X = new TestGradleVersion(GradleVersion.version('4.10.3'), 7, 10)
sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestBuildResultRecorder.groovy
+1 -1
View File
@@ -248,7 +248,7 @@ task expectFailure {
when:
settingsFile.text = """
plugins {
id 'com.gradle.develocity' version '4.6.0' apply(false)
id 'com.gradle.develocity' version '4.6.1' apply(false)
}
gradle.settingsEvaluated {
apply plugin: 'com.gradle.develocity'