Merge branch '3.1.x' into 3.2.x

Author: jameskleeh

build.gradle

@@ -472,7 +472,7 @@ subprojects { project ->
         }
 
     }
-
+    compileGroovy.dependsOn processResources
 }
 
 

grails-core/src/main/groovy/org/grails/compiler/injection/EnhancesTraitTransformation.groovy

@@ -86,8 +86,8 @@ class EnhancesTraitTransformation extends AbstractArtefactTypeAstTransformation
 
             ast.classes.add transformerNode
 
-            def compilationTargetDirectory = GlobalGrailsClassInjectorTransformation.resolveCompilationTargetDirectory(source)
-            GlobalGrailsClassInjectorTransformation.updateGrailsFactoriesWithType(transformerNode, GlobalGrailsClassInjectorTransformation.TRAIT_INJECTOR_CLASS, compilationTargetDirectory)
+            def resourcesTargetDirectory = GlobalGrailsClassInjectorTransformation.resolveResourcesTargetDirectory(source)
+            GlobalGrailsClassInjectorTransformation.updateGrailsFactoriesWithType(transformerNode, GlobalGrailsClassInjectorTransformation.TRAIT_INJECTOR_CLASS, resourcesTargetDirectory)
 
         }
 

grails-core/src/main/groovy/org/grails/compiler/injection/GlobalGrailsClassInjectorTransformation.groovy

@@ -5,6 +5,7 @@ import grails.compiler.ast.ClassInjector
 import grails.core.ArtefactHandler
 import grails.io.IOUtils
 import grails.plugins.metadata.GrailsPlugin
+import grails.util.BuildSettings
 import grails.util.GrailsNameUtils
 import groovy.transform.CompilationUnitAware
 import groovy.transform.CompileDynamic
@@ -64,7 +65,7 @@ class GlobalGrailsClassInjectorTransformation implements ASTTransformation, Comp
         Set<String> transformedClasses = []
         String pluginVersion = null
         ClassNode pluginClassNode = null
-        def compilationTargetDirectory = resolveCompilationTargetDirectory(source)
+        def compilationTargetDirectory = resolveResourcesTargetDirectory(source)
         def pluginXmlFile = new File(compilationTargetDirectory, "META-INF/grails-plugin.xml")
 
         for (ClassNode classNode : classes) {
@@ -142,6 +143,10 @@ class GlobalGrailsClassInjectorTransformation implements ASTTransformation, Comp
         generatePluginXml(pluginClassNode, pluginVersion, transformedClasses, pluginXmlFile)
     }
 
+    static File resolveResourcesTargetDirectory(SourceUnit source) {
+        BuildSettings.RESOURCES_DIR ?: new File(resolveCompilationTargetDirectory(source), '../../resources/main/')
+    }
+
     static File resolveCompilationTargetDirectory(SourceUnit source) {
         File targetDirectory = source.configuration.targetDirectory
         if(targetDirectory==null && source.getClass().name == 'org.codehaus.jdt.groovy.control.EclipseSourceUnit') {
@@ -150,13 +155,14 @@ class GlobalGrailsClassInjectorTransformation implements ASTTransformation, Comp
         return targetDirectory
     }
 
-    static boolean updateGrailsFactoriesWithType(ClassNode classNode, ClassNode superType, File compilationTargetDirectory) {
+    static boolean updateGrailsFactoriesWithType(ClassNode classNode, ClassNode superType, File targetDirectory) {
         if (GrailsASTUtils.isSubclassOfOrImplementsInterface(classNode, superType)) {
             if(Modifier.isAbstract(classNode.getModifiers())) return false
 
             def classNodeName = classNode.name
             // generate META-INF/grails.factories
-            def factoriesFile = new File(compilationTargetDirectory, "META-INF/grails.factories")
+
+            def factoriesFile = new File(targetDirectory, "META-INF/grails.factories")
             factoriesFile.parentFile.mkdirs()
             def props = new Properties()
             def superTypeName = superType.getName()

grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy

@@ -127,6 +127,8 @@ class GrailsGradlePlugin extends GroovyPlugin {
         configureRunCommand(project)
 
         configurePathingJar(project)
+
+        configureResourceProcessing(project)
     }
 
     protected void configureProfile(Project project) {
@@ -231,6 +233,14 @@ class GrailsGradlePlugin extends GroovyPlugin {
         System.setProperty(BuildSettings.APP_BASE_DIR, project.projectDir.absolutePath)
     }
 
+    protected void configureResourceProcessing(Project project) {
+        def tasks = project.tasks
+        def resourcesTask = tasks.findByName('processResources')
+        if (resourcesTask) {
+            tasks.findByName('compileGroovy')?.dependsOn resourcesTask
+        }
+    }
+
     protected void configureApplicationCommands(Project project) {
         def applicationContextCommands = FactoriesLoaderSupport.loadFactoryNames(APPLICATION_CONTEXT_COMMAND_CLASS)
         for (ctxCommand in applicationContextCommands) {

grails-plugin-async/src/main/groovy/grails/artefact/AsyncController.groovy

@@ -37,6 +37,7 @@ import org.springframework.web.context.request.RequestContextHolder
  *
  */
 @CompileStatic
+@Enhances('Controller')
 trait AsyncController extends Events {
 
     /**

grails-plugin-async/src/main/groovy/grails/compiler/traits/AsyncControllerTraitInjector.groovy

@@ -66,6 +66,7 @@ import java.lang.reflect.Method
  *
  */
 @CompileStatic
+@Enhances('Controller')
 trait Controller implements ResponseRenderer, ResponseRedirector, RequestForwarder, DataBinder, WebAttributes, ServletAttributes {
 
     private MimeTypesApiSupport mimeTypesSupport = new MimeTypesApiSupport()