Merge pull request #11546 from grails/forceGroovyVersion

Force Groovy version 3.0.3
grails · May 15, 2020 · bde0476 · bde0476
2 parents 30c6f36 + 7eaba1f
commit bde0476
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy b/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy
@@ -31,7 +31,10 @@ import org.gradle.api.Action
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.Task
-import org.gradle.api.artifacts.*
+import org.gradle.api.artifacts.Configuration
+import org.gradle.api.artifacts.ConfigurationContainer
+import org.gradle.api.artifacts.Dependency
+import org.gradle.api.artifacts.DependencyResolveDetails
 import org.gradle.api.file.FileCollection
 import org.gradle.api.java.archives.Manifest
 import org.gradle.api.plugins.ExtraPropertiesExtension
@@ -94,6 +97,8 @@ class GrailsGradlePlugin extends GroovyPlugin {
 
         applyDefaultPlugins(project)
 
+        configureGroovy(project)
+
         registerToolingModelBuilder(project, registry)
 
         registerGrailsExtension(project)
@@ -208,6 +213,23 @@ class GrailsGradlePlugin extends GroovyPlugin {
         }
     }
 
+    @CompileStatic
+    protected void configureGroovy(Project project) {
+        final String groovyVersion = project.properties['groovyVersion']
+        if (groovyVersion) {
+            project.configurations.all({ Configuration configuration ->
+                configuration.resolutionStrategy.eachDependency({ DependencyResolveDetails details ->
+                    String dependencyName = details.requested.name
+                    String group = details.requested.group
+                    if (group == 'org.codehaus.groovy' && dependencyName.startsWith('groovy')) {
+                        details.useVersion(groovyVersion)
+                        return
+                    }
+                } as Action<DependencyResolveDetails>)
+            } as Action<Configuration>)
+        }
+    }
+
     @CompileStatic
     protected void configureSpringBootExtension(Project project) {
         def springBoot = project.extensions.findByType(SpringBootExtension)

diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/CreateAppCommand.groovy b/grails-shell/src/main/groovy/org/grails/cli/profile/commands/CreateAppCommand.groovy
@@ -227,6 +227,10 @@ class CreateAppCommand extends ArgumentCompletingCommand implements ProfileRepos
                 if(gormDep != null) {
                     variables['gorm.version'] = gormDep
                 }
+                String groovyDep = mpr.profileDependencyVersions.versionProperties.get('groovy.version')
+                if(groovyDep != null) {
+                    variables['groovy.version'] = groovyDep
+                }
             }
 
             Path appFullDirectory = Paths.get(cmd.baseDir.path, appname)