Skip to content

Commit 8cec9e9

Browse files
committed
Update to Gradle 8.3
1 parent 98e45bf commit 8cec9e9

File tree

8 files changed

+37
-7
lines changed

8 files changed

+37
-7
lines changed

gradle/wrapper/gradle-wrapper.jar

346 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
8788

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

samples/versions-in-catalog/build-logic/src/main/kotlin/org.my.gradle.java-module.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ plugins {
55

66
group = "org.my"
77

8+
javaModuleDependencies.versionsFromConsistentResolution(":app")
9+
810
tasks.test {
911
useJUnitPlatform()
1012
jvmArgs("-Dorg.slf4j.simpleLogger.defaultLogLevel=error")
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package org.my.lib.test;
2+
3+
import org.junit.jupiter.api.Test;
4+
5+
class MyLibTest {
6+
7+
@Test
8+
void test() {
9+
}
10+
11+
}

samples/versions-in-platform/build-logic/src/main/kotlin/org.my.gradle.java-module.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ plugins {
55

66
group = "org.my"
77

8+
javaModuleDependencies.versionsFromConsistentResolution(":app")
9+
810
tasks.test {
911
useJUnitPlatform()
1012
jvmArgs("-Dorg.slf4j.simpleLogger.defaultLogLevel=error")
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package org.my.lib.test;
2+
3+
import org.junit.jupiter.api.Test;
4+
5+
class MyLibTest {
6+
7+
@Test
8+
void test() {
9+
}
10+
11+
}

src/test/groovy/org/gradlex/javamodule/dependencies/test/RequiresRuntimeTest.groovy

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,14 @@ class RequiresRuntimeTest extends Specification {
158158
159159
val syntheticModules = javaModuleDependencies.addRequiresRuntimeSupport(this, sourceSets.main.get())
160160
161-
options.compilerArgs.add("--module-path")
162-
options.compilerArgs.add(classpath.files.joinToString(":") + ":" + syntheticModules.files.joinToString(":"))
163-
options.compilerArgs.add("--patch-module")
164-
options.compilerArgs.add("org.gradlex.test.app=" + sourceSets.test.get().java.sourceDirectories.first())
165-
161+
options.compilerArgumentProviders.add {
162+
listOf(
163+
"--module-path",
164+
classpath.files.joinToString(":") + ":" + syntheticModules.files.joinToString(":"),
165+
"--patch-module",
166+
"org.gradlex.test.app=" + sourceSets.test.get().java.sourceDirectories.first()
167+
)
168+
}
166169
}
167170
168171
dependencies.constraints {

0 commit comments

Comments
 (0)