Skip to content

Commit 23ddad1

Browse files
committed
Propagate gradle.properties to buildSrc
Update `buildSrc` so that properties frok the root `gradle.properties` file are available. See gh-42333
1 parent 2aea7ca commit 23ddad1

File tree

4 files changed

+21
-23
lines changed

4 files changed

+21
-23
lines changed

buildSrc/build.gradle

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,51 +13,40 @@ repositories {
1313
sourceCompatibility = 17
1414
targetCompatibility = 17
1515

16-
def versions = [:]
17-
new File(projectDir.parentFile, "gradle.properties").withInputStream {
18-
def properties = new Properties()
19-
properties.load(it)
20-
["assertj", "commonsCodec", "hamcrest", "jackson", "junitJupiter",
21-
"kotlin", "maven"].each {
22-
versions[it] = properties[it + "Version"]
23-
}
24-
}
25-
versions["springFramework"] = "6.0.12"
26-
ext.set("versions", versions)
27-
if (versions.springFramework.contains("-")) {
16+
if ("${springFrameworkVersion}".contains("-")) {
2817
repositories {
2918
maven { url "https://repo.spring.io/milestone" }
3019
maven { url "https://repo.spring.io/snapshot" }
3120
}
3221
}
3322

3423
checkstyle {
35-
toolVersion = "10.12.4"
24+
toolVersion = "{checkstyleToolVersion}"
3625
}
3726

3827
dependencies {
3928
checkstyle("com.puppycrawl.tools:checkstyle:${checkstyle.toolVersion}")
4029
checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}")
4130

42-
implementation(platform("org.springframework:spring-framework-bom:${versions.springFramework}"))
43-
implementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson}")
31+
implementation(platform("org.springframework:spring-framework-bom:${springFrameworkVersion}"))
32+
implementation("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}")
4433
implementation("com.gradle:develocity-gradle-plugin:3.17.2")
4534
implementation("com.tngtech.archunit:archunit:1.3.0")
46-
implementation("commons-codec:commons-codec:${versions.commonsCodec}")
35+
implementation("commons-codec:commons-codec:${commonsCodecVersion}")
4736
implementation("de.undercouch.download:de.undercouch.download.gradle.plugin:5.5.0")
4837
implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}")
49-
implementation("org.apache.maven:maven-embedder:${versions.maven}")
38+
implementation("org.apache.maven:maven-embedder:${mavenVersion}")
5039
implementation("org.asciidoctor:asciidoctor-gradle-jvm:4.0.2")
51-
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}")
52-
implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:${versions.kotlin}")
40+
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
41+
implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:${kotlinVersion}")
5342
implementation("org.springframework:spring-context")
5443
implementation("org.springframework:spring-core")
5544
implementation("org.springframework:spring-web")
5645
implementation("io.spring.nohttp:nohttp-gradle:0.0.11")
5746

58-
testImplementation("org.assertj:assertj-core:${versions.assertj}")
59-
testImplementation("org.hamcrest:hamcrest:${versions.hamcrest}")
60-
testImplementation("org.junit.jupiter:junit-jupiter:${versions.junitJupiter}")
47+
testImplementation("org.assertj:assertj-core:${assertjVersion}")
48+
testImplementation("org.hamcrest:hamcrest:${hamcrestVersion}")
49+
testImplementation("org.junit.jupiter:junit-jupiter:${junitJupiterVersion}")
6150
testImplementation("org.springframework:spring-test")
6251

6352
testRuntimeOnly("org.junit.platform:junit-platform-launcher")

buildSrc/gradle.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

buildSrc/settings.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,11 @@ pluginManagement {
44
gradlePluginPortal()
55
}
66
}
7+
8+
gradle.rootProject((project) -> {
9+
new File(rootDir.parentFile, "gradle.properties").withInputStream {
10+
def properties = new Properties()
11+
properties.load(it)
12+
properties.forEach(project.ext::set)
13+
}
14+
});

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ org.gradle.parallel=true
66
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
77

88
assertjVersion=3.24.2
9+
checkstyleToolVersion=10.12.4
910
commonsCodecVersion=1.16.1
1011
commonsCompressVersion=1.21
1112
hamcrestVersion=2.2
1213
jacksonVersion=2.15.4
14+
javaFormatVersion=0.0.43
1315
junitJupiterVersion=5.10.3
1416
kotlinVersion=1.9.25
1517
mavenVersion=3.9.4

0 commit comments

Comments
 (0)