Skip to content

Commit 964629f

Browse files
committed
Update to Gradle 8.12
1 parent 8fb68f0 commit 964629f

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ configurations.compileClasspath {
2828
dependencies {
2929
implementation("org.ow2.asm:asm:9.7.1")
3030

31-
compileOnly("org.gradlex:extra-java-module-info:1.8")
31+
compileOnly("org.gradlex:extra-java-module-info:1.9")
3232
compileOnly("com.autonomousapps:dependency-analysis-gradle-plugin:2.6.1")
3333

3434
testImplementation("org.spockframework:spock-core:2.1-groovy-3.0")

gradle/plugins/src/main/kotlin/gradlexbuild.module-mappings.gradle.kts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@ detachedResolver.repositories.ivy {
1616
setM2compatible(true)
1717
}
1818
}
19-
val modulePropertiesConfiguration = detachedResolver.configurations.create("moduleProperties")
20-
val dep = detachedResolver.dependencies.add(modulePropertiesConfiguration.name, "com.github.sormuras.modules:modules:1")
19+
val modulePropertiesScope = detachedResolver.configurations.dependencyScope("moduleProperties")
20+
val modulePropertiesPath = detachedResolver.configurations.resolvable("modulePropertiesPath") {
21+
extendsFrom(modulePropertiesScope.get())
22+
}
23+
val dep = detachedResolver.dependencies.add(modulePropertiesScope.name, "com.github.sormuras.modules:modules:1")
2124
(dep as ExternalModuleDependency).isChanging = true
2225

2326
val updateUniqueModulesProperties = tasks.register<UniqueModulesPropertiesUpdate>("updateUniqueModulesProperties") {
2427
skipUpdate.set(providers.environmentVariable("CI").getOrElse("false").toBoolean())
25-
modulesProperties.from(modulePropertiesConfiguration)
28+
modulesProperties.from(modulePropertiesPath)
2629
uniqueModulesProperties.set(layout.projectDirectory.file(
2730
"src/main/resources/org/gradlex/javamodule/dependencies/unique_modules.properties")
2831
)

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.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

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

settings.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ plugins {
66
}
77

88
dependencyResolutionManagement {
9-
repositories.mavenCentral()
10-
repositories.gradlePluginPortal()
9+
repositories {
10+
mavenCentral()
11+
gradlePluginPortal()
12+
}
1113
}
1214

1315
rootProject.name = "java-module-dependencies"

0 commit comments

Comments
 (0)