Reverting recent changes related to #10238.

Author: jeffscottbrown

build.gradle

@@ -450,7 +450,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 resourcesTargetDirectory = GlobalGrailsClassInjectorTransformation.resolveResourcesTargetDirectory(source)
-            GlobalGrailsClassInjectorTransformation.updateGrailsFactoriesWithType(transformerNode, GlobalGrailsClassInjectorTransformation.TRAIT_INJECTOR_CLASS, resourcesTargetDirectory)
+            def compilationTargetDirectory = GlobalGrailsClassInjectorTransformation.resolveCompilationTargetDirectory(source)
+            GlobalGrailsClassInjectorTransformation.updateGrailsFactoriesWithType(transformerNode, GlobalGrailsClassInjectorTransformation.TRAIT_INJECTOR_CLASS, compilationTargetDirectory)
 
         }
 

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

@@ -5,7 +5,6 @@ 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
@@ -65,7 +64,7 @@ class GlobalGrailsClassInjectorTransformation implements ASTTransformation, Comp
         Set<String> transformedClasses = []
         String pluginVersion = null
         ClassNode pluginClassNode = null
-        def compilationTargetDirectory = resolveResourcesTargetDirectory(source)
+        def compilationTargetDirectory = resolveCompilationTargetDirectory(source)
         def pluginXmlFile = new File(compilationTargetDirectory, "META-INF/grails-plugin.xml")
 
         for (ClassNode classNode : classes) {
@@ -143,10 +142,6 @@ 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') {
@@ -155,14 +150,13 @@ class GlobalGrailsClassInjectorTransformation implements ASTTransformation, Comp
         return targetDirectory
     }
 
-    static boolean updateGrailsFactoriesWithType(ClassNode classNode, ClassNode superType, File targetDirectory) {
+    static boolean updateGrailsFactoriesWithType(ClassNode classNode, ClassNode superType, File compilationTargetDirectory) {
         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(targetDirectory, "META-INF/grails.factories")
+            def factoriesFile = new File(compilationTargetDirectory, "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

@@ -122,8 +122,6 @@ class GrailsGradlePlugin extends GroovyPlugin {
         createBuildPropertiesTask(project)
 
         configurePathingJar(project)
-
-        configureResourceProcessing(project)
     }
 
     protected void configureProfile(Project project) {
@@ -223,14 +221,6 @@ 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) {