Skip to content

Commit 2767342

Browse files
committed
Update to support environment variables and default to values in buildSrc/build.gradle
1 parent f7f34c3 commit 2767342

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,13 @@ GradleBuild gradleBuild,
3232
String grailsVersion
3333
)
3434

35-
file('../gradle.properties').withInputStream {
36-
Properties props = new Properties()
37-
props.load(it)
38-
project.ext.gradleProperties = props
35+
// load the root gradle.properties only for properties not already set (e.g., by environment variables like ORG_GRADLE_PROJECT_grailsVersion=7.0.0)
36+
def props = new Properties()
37+
file('../gradle.properties').withInputStream { props.load(it) }
38+
props.each { key, val ->
39+
if (!project.hasProperty(key)) {
40+
project.ext."$key" = val
41+
}
3942
}
4043

4144
repositories {
@@ -59,7 +62,7 @@ repositories {
5962
}
6063

6164
dependencies {
62-
implementation platform("org.apache.grails:grails-gradle-bom:$gradleProperties.grailsVersion")
65+
implementation platform("org.apache.grails:grails-gradle-bom:$grailsVersion")
6366
@for (GradleDependency dependency : gradleBuild.getBuildSrcDependencies()) {
6467
@dependency.toSnippet()
6568
}

0 commit comments

Comments
 (0)