Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: gradle/actions
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.4.2
Choose a base ref
...
head repository: gradle/actions
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.5.0
Choose a head ref
6 contributors

Commits on Jun 20, 2024

  1. Fix grammar in docs

    @erichaagdev
    erichaagdev authored Jun 20, 2024
    Copy the full SHA
    2cd2a6e View commit details

Commits on Jun 27, 2024

  1. Update known wrapper checksums

    @bigdaz
    bigdaz committed Jun 27, 2024
    Copy the full SHA
    3f3913e View commit details

  2. [bot] Update dist directory

    @bigdaz @github-actions
    bigdaz authored and github-actions[bot] committed Jun 27, 2024
    Copy the full SHA
    a6a0c7d View commit details

Commits on Jun 28, 2024

  1. Bump org.junit.jupiter:junit-jupiter 

    Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.10.2 to 5.10.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.10.2...r5.10.3)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot @bigdaz
    dependabot[bot] authored and bigdaz committed Jun 28, 2024
    Copy the full SHA
    c401249 View commit details

  2. Rename Develocity secret

    @bigdaz
    bigdaz committed Jun 28, 2024
    Copy the full SHA
    1da1cc9 View commit details

  3. Remove instructions for merging Dependabot PRs 

    These are no longer required, since the bot will update the `dist` directory.
    @bigdaz
    bigdaz authored Jun 28, 2024
    Copy the full SHA
    c04155e View commit details

  4. Use latest dependency graph plugin (#269)

    @bigdaz
    bigdaz authored Jun 28, 2024
    Copy the full SHA
    b9abb7b View commit details

  5. Provision latest Gradle for cache-cleanup 

    To cleanup Gradle User Home, a Gradle build must be executed.
Newer Gradle versions are able to cleanup the home directories of older versions,
but not vice-versa.

With this change, the latest version of Gradle is automatically provisioned
in order to run Gradle User Home cleanup. This ensures a consistent version of
Gradle is used for cleanup, and fixes #33 where Gradle is not pre-installed on
a custom runner.
    @bigdaz
    bigdaz committed Jun 28, 2024
    Copy the full SHA
    169bec5 View commit details

  6. Use Gradle 8.8 features for cleanup 

    Gradle 8.8 introduces new features that allow us to avoid using
timestamp manipulation to force the cleanup of the Gradle User Home directory.

This solution is simpler and more robust, but relies on Gradle 8.8+ always being
used for the cache cleanup operation.

Fixes #24
    @bigdaz
    bigdaz committed Jun 28, 2024
    Copy the full SHA
    95ef722 View commit details

  7. Fix integ-test-cache-cleanup.yml for running on act

    @bigdaz
    bigdaz committed Jun 28, 2024
    Copy the full SHA
    4022faa View commit details

  8. Run cache-cleanup build with --info 

    Resolves #169
    @bigdaz
    bigdaz committed Jun 28, 2024
    Copy the full SHA
    621f3b3 View commit details

  9. Use Gradle 8.8 features for Gradle Home cleanup (#272) 

    Fixes #33
Fixes #24
Fixes #46 
Fixes #169
    @bigdaz
    bigdaz authored Jun 28, 2024
    Copy the full SHA
    dad038d View commit details

  10. [bot] Update dist directory

    @bigdaz @github-actions
    bigdaz authored and github-actions[bot] committed Jun 28, 2024
    Copy the full SHA
    cdbbabd View commit details

Commits on Jul 2, 2024

  1. Clarify that tags are isolated in cache entries

    @bigdaz
    bigdaz authored Jul 2, 2024
    Copy the full SHA
    81b4ece View commit details

Commits on Jul 5, 2024

  1. Update DV plugin versions that were missed by automation

    @bigdaz
    bigdaz committed Jul 5, 2024
    Copy the full SHA
    87bf5ca View commit details

Commits on Jul 12, 2024

  1. Update known wrapper checksums (#278) 

    Automatically generated pull request to update the known wrapper
checksums.

Co-authored-by: bigdaz <179734+bigdaz@users.noreply.github.com>
    @github-actions @bigdaz
    github-actions[bot] and bigdaz authored Jul 12, 2024
    Copy the full SHA
    6407986 View commit details

  2. Bump com.fasterxml.jackson.dataformat:jackson-dataformat-smile 

    Bumps [com.fasterxml.jackson.dataformat:jackson-dataformat-smile](https://github.com/FasterXML/jackson-dataformats-binary) from 2.17.1 to 2.17.2.
- [Commits](FasterXML/jackson-dataformats-binary@jackson-dataformats-binary-2.17.1...jackson-dataformats-binary-2.17.2)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-smile
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot @bigdaz
    dependabot[bot] authored and bigdaz committed Jul 12, 2024
    Copy the full SHA
    d7cd9fc View commit details

  3. [bot] Update dist directory

    @bigdaz @github-actions
    bigdaz authored and github-actions[bot] committed Jul 12, 2024
    Copy the full SHA
    e5bbd4c View commit details

Commits on Jul 14, 2024

  1. Update to Gradle 8.9

    @bigdaz
    bigdaz committed Jul 14, 2024
    Copy the full SHA
    c3acd19 View commit details

Commits on Jul 15, 2024

  1. Upload dependency graph on submission failure (#291)

    @bigdaz
    bigdaz authored Jul 15, 2024
    Copy the full SHA
    ff865cb View commit details

  2. [bot] Update dist directory

    @bigdaz @github-actions
    bigdaz authored and github-actions[bot] committed Jul 15, 2024
    Copy the full SHA
    d9c87d4 View commit details
Showing with 6,367 additions and 506 deletions.
  1. BIN .github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.jar
  2. +2 −2 .github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.properties
  3. +5 −2 .github/workflow-samples/gradle-plugin/gradlew
  4. +12 −10 .github/workflow-samples/gradle-plugin/gradlew.bat
  5. BIN .github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.jar
  6. +2 −2 .github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.properties
  7. +5 −2 .github/workflow-samples/groovy-dsl/gradlew
  8. +12 −10 .github/workflow-samples/groovy-dsl/gradlew.bat
  9. BIN .github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.jar
  10. +2 −2 .github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.properties
  11. +5 −2 .github/workflow-samples/java-toolchain/gradlew
  12. +12 −10 .github/workflow-samples/java-toolchain/gradlew.bat
  13. +1 −1 .github/workflow-samples/kotlin-dsl/build.gradle.kts
  14. BIN .github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.jar
  15. +2 −2 .github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.properties
  16. +5 −2 .github/workflow-samples/kotlin-dsl/gradlew
  17. +12 −10 .github/workflow-samples/kotlin-dsl/gradlew.bat
  18. BIN .github/workflow-samples/non-executable-wrapper/gradle/wrapper/gradle-wrapper.jar
  19. +2 −2 .github/workflow-samples/non-executable-wrapper/gradle/wrapper/gradle-wrapper.properties
  20. +5 −2 .github/workflow-samples/non-executable-wrapper/gradlew
  21. +12 −10 .github/workflow-samples/non-executable-wrapper/gradlew.bat
  22. +1 −1 .github/workflows/ci-integ-test.yml
  23. +9 −3 .github/workflows/integ-test-cache-cleanup.yml
  24. +5 −5 .github/workflows/integ-test-inject-develocity.yml
  25. +1 −17 CONTRIBUTING.md
  26. +107 −83 dist/dependency-submission/main/index.js
  27. +1 −1 dist/dependency-submission/main/index.js.map
  28. +2,893 −29 dist/dependency-submission/post/index.js
  29. +1 −1 dist/dependency-submission/post/index.js.map
  30. +107 −83 dist/setup-gradle/main/index.js
  31. +1 −1 dist/setup-gradle/main/index.js.map
  32. +2,963 −83 dist/setup-gradle/post/index.js
  33. +1 −1 dist/setup-gradle/post/index.js.map
  34. +1 −1 dist/wrapper-validation/main/index.js
  35. +1 −1 docs/dependency-submission.md
  36. +1 −1 docs/deprecation-upgrade-guide.md
  37. +3 −3 docs/setup-gradle.md
  38. +1 −1 sources/.tool-versions
  39. +42 −41 sources/src/caching/cache-cleaner.ts
  40. +79 −64 sources/src/dependency-graph.ts
  41. +1 −1 sources/src/resources/init-scripts/gradle-actions.github-dependency-graph-gradle-plugin-apply.groovy
  42. +12 −0 sources/src/wrapper-validation/wrapper-checksums.json
  43. +1 −1 sources/test/init-scripts/build.gradle
  44. BIN sources/test/init-scripts/gradle/wrapper/gradle-wrapper.jar
  45. +2 −2 sources/test/init-scripts/gradle/wrapper/gradle-wrapper.properties
  46. +5 −2 sources/test/init-scripts/gradlew
  47. +2 −0 sources/test/init-scripts/gradlew.bat
  48. +1 −1 sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy
  49. +2 −2 sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy
  50. +27 −6 sources/test/jest/cache-cleanup.test.ts
Binary file modified .github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions .github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
7 changes: 5 additions & 2 deletions .github/workflow-samples/gradle-plugin/gradlew
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
@@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
22 changes: 12 additions & 10 deletions .github/workflow-samples/gradle-plugin/gradlew.bat
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
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

goto fail

@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
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

goto fail

Binary file modified .github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions .github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
7 changes: 5 additions & 2 deletions .github/workflow-samples/groovy-dsl/gradlew
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
@@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
22 changes: 12 additions & 10 deletions .github/workflow-samples/groovy-dsl/gradlew.bat
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
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

goto fail

@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
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

goto fail

Binary file modified .github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions .github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
7 changes: 5 additions & 2 deletions .github/workflow-samples/java-toolchain/gradlew
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
@@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
22 changes: 12 additions & 10 deletions .github/workflow-samples/java-toolchain/gradlew.bat
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
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

goto fail

@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
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

goto fail

2 changes: 1 addition & 1 deletion .github/workflow-samples/kotlin-dsl/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ dependencies {
api("org.apache.commons:commons-math3:3.6.1")
implementation("com.google.guava:guava:33.2.1-jre")

testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
testImplementation("org.junit.jupiter:junit-jupiter:5.10.3")
}

tasks.test {
Binary file modified .github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions .github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
7 changes: 5 additions & 2 deletions .github/workflow-samples/kotlin-dsl/gradlew
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
@@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
22 changes: 12 additions & 10 deletions .github/workflow-samples/kotlin-dsl/gradlew.bat
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
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

goto fail

@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
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

goto fail

Binary file modified .github/workflow-samples/non-executable-wrapper/gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions .github/workflow-samples/non-executable-wrapper/gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
7 changes: 5 additions & 2 deletions .github/workflow-samples/non-executable-wrapper/gradlew
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
@@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Loading