Skip to content

Load the root gradle.properties only for properties not already set in buildSrc #602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamesfredley merged 5 commits into from
Jun 26, 2025
Merged

Load the root gradle.properties only for properties not already set in buildSrc #602

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f7f34c3
Use $grailsVersion from gradle.properties
jamesfredley Jun 26, 2025
2767342
Update to support environment variables and default to values in buil…
jamesfredley Jun 26, 2025
a354ace
Merge branch '7.0.x' into use-gradle-properties-versions
jamesfredley Jun 26, 2025
033cbdc
Update comments
jamesfredley Jun 26, 2025
686761f
Update buildSrcBuildGradle.rocker.raw
jamesfredley Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions .../main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,17 @@ GradleBuild gradleBuild,
String grailsVersion
)

// load the root gradle.properties only for properties not already set
// (e.g., buildSrc/gradle.properties or by environment variables like ORG_GRADLE_PROJECT_grailsVersion=7.0.0)
// https://github.com/gradle/gradle/issues/2534
def props = new Properties()
file('../gradle.properties').withInputStream { props.load(it) }
props.each { key, val ->
if (!project.hasProperty(key)) {
project.ext."$key" = val
}
}

repositories {
mavenCentral()
maven { url = 'https://repo.grails.org/grails/restricted' }
Expand All @@ -53,8 +64,8 @@ repositories {
}

dependencies {
implementation platform("org.apache.grails:grails-bom:@VersionInfo.getGrailsVersion()")
implementation platform("org.apache.grails:grails-bom:$grailsVersion")
@for (GradleDependency dependency : gradleBuild.getBuildSrcDependencies()) {
@dependency.toSnippet()
}
}
}
Loading