Skip to content

Commit ed3e155

Browse files
authored
Merge pull request #602 from apache/use-gradle-properties-versions
Load the root gradle.properties only for properties not already set in buildSrc
2 parents 1e635cb + 686761f commit ed3e155

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

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

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

35+
// load the root gradle.properties only for properties not already set
36+
// (e.g., buildSrc/gradle.properties or by environment variables like ORG_GRADLE_PROJECT_grailsVersion=7.0.0)
37+
// https://github.com/gradle/gradle/issues/2534
38+
def props = new Properties()
39+
file('../gradle.properties').withInputStream { props.load(it) }
40+
props.each { key, val ->
41+
if (!project.hasProperty(key)) {
42+
project.ext."$key" = val
43+
}
44+
}
45+
3546
repositories {
3647
mavenCentral()
3748
maven { url = 'https://repo.grails.org/grails/restricted' }
@@ -53,8 +64,8 @@ repositories {
5364
}
5465

5566
dependencies {
56-
implementation platform("org.apache.grails:grails-bom:@VersionInfo.getGrailsVersion()")
67+
implementation platform("org.apache.grails:grails-bom:$grailsVersion")
5768
@for (GradleDependency dependency : gradleBuild.getBuildSrcDependencies()) {
5869
@dependency.toSnippet()
5970
}
60-
}
71+
}

0 commit comments

Comments
 (0)