diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c8956e2a..455f4cc11 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: matrix: os: [ ubuntu-24.04-arm, windows-latest ] # Test on the minimum Gradle version and the latest. - gradle: [ 9.0.0, current ] + gradle: [ 9.1.0, current ] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v6 diff --git a/README.md b/README.md index 787b9a6e4..912cac6a4 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ Gradle plugin for creating fat/uber JARs with support for package relocation. | 9.0.0+ | 8.11 | 11 | [`com.gradleup.shadow`][gradleup's] | | 9.2.0+ | 8.11 | 17 | [`com.gradleup.shadow`][gradleup's] | | 9.3.0+ | 9.0 | 17 | [`com.gradleup.shadow`][gradleup's] | +| 9.5.0+ | 9.1 | 17 | [`com.gradleup.shadow`][gradleup's] | diff --git a/docs/README.md b/docs/README.md index 78d388b57..c2aa6f4ad 100644 --- a/docs/README.md +++ b/docs/README.md @@ -27,6 +27,7 @@ dependent libraries into the output jar without incurring the I/O overhead of ex | 9.0.0+ | 8.11 | 11 | [`com.gradleup.shadow`][gradleup's] | | 9.2.0+ | 8.11 | 17 | [`com.gradleup.shadow`][gradleup's] | | 9.3.0+ | 9.0 | 17 | [`com.gradleup.shadow`][gradleup's] | +| 9.5.0+ | 9.1 | 17 | [`com.gradleup.shadow`][gradleup's] | ## Benefits of Shadow diff --git a/docs/changes/README.md b/docs/changes/README.md index 07af8f9b8..c4cafd4a5 100644 --- a/docs/changes/README.md +++ b/docs/changes/README.md @@ -3,6 +3,9 @@ ## [Unreleased](https://github.com/GradleUp/shadow/compare/9.4.1...HEAD) - 2026-xx-xx +### Changed + +- Bump min Gradle requirement to 9.1.0. ([#2016](https://github.com/GradleUp/shadow/pull/2016)) ## [9.4.1](https://github.com/GradleUp/shadow/releases/tag/9.4.1) - 2026-03-27 diff --git a/gradle.properties b/gradle.properties index e4dcce867..b98a32a74 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ signAllPublications=true GROUP=com.gradleup.shadow POM_ARTIFACT_ID=shadow-gradle-plugin -VERSION_NAME=9.4.2-SNAPSHOT +VERSION_NAME=9.5.0-SNAPSHOT POM_NAME=Shadow Gradle Plugin POM_DESCRIPTION=Gradle plugin to create fat/uber JARs, apply file transforms, and relocate packages for applications and libraries. Gradle version of Maven's Shade plugin. diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b6933f3f7..668a0c1a9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -minGradle = "9.0.0" +minGradle = "9.1.0" kotlin = "2.4.0-Beta2" moshi = "1.15.2" pluginPublish = "2.1.1" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d997cfc60..b1b8ef56b 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 c61a118f7..b52fb7e71 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 739907dfd..b9bb139f7 100755 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/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/. diff --git a/gradlew.bat b/gradlew.bat index c4bdd3ab8..24c62d56f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -23,8 +23,8 @@ @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ 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 +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,7 +65,7 @@ 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 +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line @@ -73,21 +73,10 @@ goto fail @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@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 -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt index e85c711e5..619f6eb0c 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt @@ -87,7 +87,7 @@ class TransformersTest : BaseTransformerTest() { assertThat(buildResult.output) .contains( // Keep this list approach for Unix/Windows test compatibility. - "Execution failed for task ':shadowJar'.", + "Execution failed for task ':shadowJar'", "> Found 1 path duplicate(s) with different content in the shadowed JAR:", " * differing-content-2", "differing-content-2 (SHA256: ed7002b439e9ac845f22357d822bac1444730fbdb6016d3ec9432297b9ec9f73)",