From f7f34c3d90de85f645c857874564c435e316858d Mon Sep 17 00:00:00 2001 From: James Fredley Date: Wed, 25 Jun 2025 22:02:49 -0400 Subject: [PATCH 1/4] Use $grailsVersion from gradle.properties --- .../build/gradle/templates/buildSrcBuildGradle.rocker.raw | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw b/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw index e5a75a73..6fdddab8 100644 --- a/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw +++ b/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw @@ -32,6 +32,12 @@ GradleBuild gradleBuild, String grailsVersion ) +file('../gradle.properties').withInputStream { + Properties props = new Properties() + props.load(it) + project.ext.gradleProperties = props +} + repositories { mavenCentral() maven { url = 'https://repo.grails.org/grails/restricted' } @@ -53,7 +59,7 @@ repositories { } dependencies { - implementation platform("org.apache.grails:grails-gradle-bom:@VersionInfo.getGrailsVersion()") + implementation platform("org.apache.grails:grails-gradle-bom:$gradleProperties.grailsVersion") @for (GradleDependency dependency : gradleBuild.getBuildSrcDependencies()) { @dependency.toSnippet() } From 2767342f41228c6ea12c235594724de9da8ac8ea Mon Sep 17 00:00:00 2001 From: James Fredley Date: Thu, 26 Jun 2025 11:00:23 -0400 Subject: [PATCH 2/4] Update to support environment variables and default to values in buildSrc/build.gradle --- .../gradle/templates/buildSrcBuildGradle.rocker.raw | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw b/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw index 6fdddab8..d8bd52e0 100644 --- a/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw +++ b/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw @@ -32,10 +32,13 @@ GradleBuild gradleBuild, String grailsVersion ) -file('../gradle.properties').withInputStream { - Properties props = new Properties() - props.load(it) - project.ext.gradleProperties = props +// load the root gradle.properties only for properties not already set (e.g., by environment variables like ORG_GRADLE_PROJECT_grailsVersion=7.0.0) +def props = new Properties() +file('../gradle.properties').withInputStream { props.load(it) } +props.each { key, val -> + if (!project.hasProperty(key)) { + project.ext."$key" = val + } } repositories { @@ -59,7 +62,7 @@ repositories { } dependencies { - implementation platform("org.apache.grails:grails-gradle-bom:$gradleProperties.grailsVersion") + implementation platform("org.apache.grails:grails-gradle-bom:$grailsVersion") @for (GradleDependency dependency : gradleBuild.getBuildSrcDependencies()) { @dependency.toSnippet() } From 033cbdc6c555c22844d9246ae48574be1c18bee7 Mon Sep 17 00:00:00 2001 From: James Fredley Date: Thu, 26 Jun 2025 11:13:06 -0400 Subject: [PATCH 3/4] Update comments --- .../build/gradle/templates/buildSrcBuildGradle.rocker.raw | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw b/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw index 57988af3..5e6eb47e 100644 --- a/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw +++ b/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw @@ -32,7 +32,8 @@ GradleBuild gradleBuild, String grailsVersion ) -// load the root gradle.properties only for properties not already set (e.g., by environment variables like ORG_GRADLE_PROJECT_grailsVersion=7.0.0) +// 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) def props = new Properties() file('../gradle.properties').withInputStream { props.load(it) } props.each { key, val -> From 686761fc5503c2093b0c1082985c595b8ee10c9d Mon Sep 17 00:00:00 2001 From: James Fredley Date: Thu, 26 Jun 2025 11:47:35 -0400 Subject: [PATCH 4/4] Update buildSrcBuildGradle.rocker.raw --- .../build/gradle/templates/buildSrcBuildGradle.rocker.raw | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw b/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw index 5e6eb47e..7f06f7e0 100644 --- a/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw +++ b/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw @@ -34,6 +34,7 @@ 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 -> @@ -67,4 +68,4 @@ dependencies { @for (GradleDependency dependency : gradleBuild.getBuildSrcDependencies()) { @dependency.toSnippet() } -} \ No newline at end of file +}