Merge pull request #412 from grails/jamesfredley/update-dependencies-…

…grails-7

update dependencies for grails 7

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 {
@@ -23,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
@@ -38,6 +44,13 @@ subprojects { project ->
             }
         }
     }
+}
+
+subprojects { project ->
+
+    version rootProject.projectVersion
+
+    ext['groovyVersion'] = System.getenv('CI_GROOVY_VERSION') ?: project.groovyVersion
 
     ext {
         userOrg = "grails"

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=7.0.0-SNAPSHOT
 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