From 5c2f3fee5ed0e07c3bd6724a0ef607ccbc65ff1c Mon Sep 17 00:00:00 2001
From: James Fredley <jamesfredley@users.noreply.github.com>
Date: Wed, 4 Sep 2024 22:14:06 -0400
Subject: [PATCH 1/3] Update several Grails 7 dependencies

---
 build.gradle      | 11 +++++++++++
 gradle.properties |  8 ++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index e817affa..3e993fea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,6 +10,17 @@ buildscript {
         classpath "io.github.gradle-nexus:publish-plugin:2.0.0"
         classpath("org.asciidoctor:asciidoctor-gradle-jvm:4.0.2")
     }
+
+    configurations.configureEach {
+        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+            // This is a workaround for dependencies exposing a different version of Groovy
+            // than the one used by Gradle. This causes issues with the Groovy compiler.
+            if (details.requested.group == 'org.apache.groovy' || details.requested.group == 'org.codehaus.groovy') {
+                details.useTarget(group: "org.codehaus.groovy", name: details.requested.name, version: GroovySystem.version)
+                details.because "Use Groovy 3.0.x library shipped with Gradle"
+            }
+        }
+    }
 }
 
 repositories {
diff --git a/gradle.properties b/gradle.properties
index 50d301db..94fcfa47 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,16 +6,16 @@ projectUrl=https://github.com/grails/grails-testing-support
 githubSlug=grails/grails-testing-support
 githubBranch=4.0.x
 developers=Jeff Brown,James Kleeh
-grailsGradlePluginVersion=6.2.0
+grailsGradlePluginVersion=7.0.0-SNAPSHOT
 grailsVersion=7.0.0-SNAPSHOT
-grailsDocsVersion=6.0.0
+grailsDocsVersion=6.2.0
 asyncVersion=5.0.2
 groovyVersion=4.0.22
-gormVersion=8.1.2
+gormVersion=9.0.0-SNAPSHOT
 jsonViewsVersion=3.2.3
 junitPlatformVersion=1.10.2
 junitJupiterVersion=5.10.2
-gspVersion=6.2.1
+gspVersion=7.0.0-SNAPSHOT
 spockVersion=2.3-groovy-4.0
 springVersion=6.1.8
 springBootVersion=3.2.6

From 552e779c42c246e5b8b5f09ff67e3dd75028c745 Mon Sep 17 00:00:00 2001
From: James Fredley <jamesfredley@users.noreply.github.com>
Date: Wed, 4 Sep 2024 22:16:54 -0400
Subject: [PATCH 2/3] Update grails docs version

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 94fcfa47..0f661ea4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ githubBranch=4.0.x
 developers=Jeff Brown,James Kleeh
 grailsGradlePluginVersion=7.0.0-SNAPSHOT
 grailsVersion=7.0.0-SNAPSHOT
-grailsDocsVersion=6.2.0
+grailsDocsVersion=7.0.0-SNAPSHOT
 asyncVersion=5.0.2
 groovyVersion=4.0.22
 gormVersion=9.0.0-SNAPSHOT

From c6d0569a0051247a51a6ea0a51157992613a894c Mon Sep 17 00:00:00 2001
From: James Fredley <jamesfredley@users.noreply.github.com>
Date: Thu, 5 Sep 2024 10:06:03 -0400
Subject: [PATCH 3/3] Move force GROOVY 4 block to allprojects

---
 build.gradle | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3e993fea..003acd69 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,12 +34,7 @@ ext {
     commonBuild = 'https://raw.githubusercontent.com/grails/grails-common-build/gradle7'
 }
 
-subprojects { project ->
-
-    version rootProject.projectVersion
-
-    ext['groovyVersion'] = System.getenv('CI_GROOVY_VERSION') ?: project.groovyVersion
-
+allprojects  {
     configurations.configureEach {
 
         // FORCE UPGRADE OF GROOVY IN DEPENDENCIES TO GROOVY 4
@@ -49,6 +44,13 @@ subprojects { project ->
             }
         }
     }
+}
+
+subprojects { project ->
+
+    version rootProject.projectVersion
+
+    ext['groovyVersion'] = System.getenv('CI_GROOVY_VERSION') ?: project.groovyVersion
 
     ext {
         userOrg = "grails"