Skip to content

Commit 5a74ba9

Browse files
Update Gradle to v9.2.0 (#309)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jendrik Johannes <[email protected]>
1 parent 773c303 commit 5a74ba9

File tree

6 files changed

+9
-8
lines changed

6 files changed

+9
-8
lines changed

gradle/wrapper/gradle-wrapper.jar

176 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
3+
distributionSha256Sum=df67a32e86e3276d011735facb1535f64d0d88df84fa87521e90becc2d735444
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH="\\\"\\\""
118117

119118

120119
# Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
172171
# For Cygwin or MSYS, switch paths to Windows format before running java
173172
if "$cygwin" || "$msys" ; then
174173
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
175-
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
176174

177175
JAVACMD=$( cygpath --unix "$JAVACMD" )
178176

@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
212210

213211
set -- \
214212
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215-
-classpath "$CLASSPATH" \
216213
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217214
"$@"
218215

gradlew.bat

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,10 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=
7473

7574

7675
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
76+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7877

7978
:end
8079
@rem End local scope for the variables with windows NT shell

src/test/groovy/org/gradlex/jvm/dependency/conflict/test/fixture/GradleBuild.groovy

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package org.gradlex.jvm.dependency.conflict.test.fixture
22

33
import org.gradle.testkit.runner.BuildResult
44
import org.gradle.testkit.runner.GradleRunner
5+
import org.gradle.util.GradleVersion
56

67
import java.lang.management.ManagementFactory
78
import java.nio.file.Files
@@ -16,6 +17,8 @@ class GradleBuild {
1617
final static String GRADLE_VERSION_UNDER_TEST = System.getProperty("gradleVersionUnderTest")
1718
final static boolean GRADLE6_TEST = GRADLE_VERSION_UNDER_TEST?.startsWith("6.")
1819
final static boolean GRADLE7_TEST = GRADLE_VERSION_UNDER_TEST?.startsWith("7.")
20+
final static boolean GRADLE9_1_TEST = !GRADLE_VERSION_UNDER_TEST ||
21+
GradleVersion.version(GRADLE_VERSION_UNDER_TEST) >= GradleVersion.version("9.1")
1922

2023
GradleBuild(File projectDir = Files.createTempDirectory("gradle-build").toFile()) {
2124
this.projectDir = projectDir

src/test/groovy/org/gradlex/jvm/dependency/conflict/test/patch/ModifyCapabilitiesTest.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ compileClasspath - Compile classpath for source set 'main'.
4747
"""
4848

4949
expect:
50-
fail().output.contains "Cannot select module with conflict on capability 'commons-lang:commons-lang:2.6' also provided by [org.apache.commons:commons-lang3:3.11(compile)]"
50+
GradleBuild.GRADLE9_1_TEST
51+
? fail().output.contains("Cannot select module with conflict on capability 'commons-lang:commons-lang:3.11' also provided by ['commons-lang:commons-lang:2.6' (compile)]")
52+
: fail().output.contains("Cannot select module with conflict on capability 'commons-lang:commons-lang:2.6' also provided by [org.apache.commons:commons-lang3:3.11(compile)]")
5153
}
5254

5355
def "can remove capability by enum"() {

0 commit comments

Comments
 (0)