Improvements for GroovyPageForkCompileTask

graceframework · Jan 17, 2024 · d4dd657 · d4dd657
1 parent 2d8418b
commit d4dd657
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 23 deletions.
diff --git a/...-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GroovyPageForkCompileTask.groovy b/...-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GroovyPageForkCompileTask.groovy
@@ -73,7 +73,7 @@ class GroovyPageForkCompileTask extends AbstractCompile {
     String serverpath
 
     @Nested
-    GspCompileOptions compileOptions = getObjectFactory().newInstance(GspCompileOptions.class)
+    GspCompileOptions compileOptions = new GspCompileOptions()
 
     @Override
     @PathSensitive(PathSensitivity.RELATIVE)
@@ -114,21 +114,21 @@ class GroovyPageForkCompileTask extends AbstractCompile {
                         javaExecSpec.getMainClass().set(getCompilerName())
                         javaExecSpec.setClasspath(getClasspath())
 
-                        def jvmArgs = compileOptions.forkOptions.jvmArgs
+                        def jvmArgs = getCompileOptions().getForkOptions().getJvmArgs()
                         if (jvmArgs) {
                             javaExecSpec.jvmArgs(jvmArgs)
                         }
-                        javaExecSpec.setMaxHeapSize(compileOptions.forkOptions.memoryMaximumSize)
-                        javaExecSpec.setMinHeapSize(compileOptions.forkOptions.memoryInitialSize)
+                        javaExecSpec.setMaxHeapSize(getCompileOptions().getForkOptions().getMemoryMaximumSize())
+                        javaExecSpec.setMinHeapSize(getCompileOptions().getForkOptions().getMemoryInitialSize())
 
                         //This is the OLD Style and seems kinda silly to be hard coded this way. but restores functionality
                         //for now
                         def configFiles = [
-                                project.file('grails-app/conf/application.yml').canonicalPath,
-                                project.file('grails-app/conf/application.groovy').canonicalPath
+                                getProject().file('grails-app/conf/application.yml').getCanonicalPath(),
+                                getProject().file('grails-app/conf/application.groovy').getCanonicalPath()
                         ].join(',')
 
-                        Path path = Paths.get(tmpDirPath)
+                        Path path = Paths.get(getTmpDirPath())
                         File tmp
                         if (Files.exists(path)) {
                             tmp = path.toFile()
@@ -137,14 +137,14 @@ class GroovyPageForkCompileTask extends AbstractCompile {
                             tmp = Files.createDirectories(path).toFile()
                         }
                         def arguments = [
-                                srcDir.canonicalPath,
-                                destinationDirectory.getAsFile().getOrNull()?.canonicalPath,
-                                tmp.canonicalPath,
-                                targetCompatibility,
-                                packageName,
-                                serverpath,
+                                getSrcDir().getCanonicalPath(),
+                                getDestinationDirectory().getAsFile().getOrNull()?.getCanonicalPath(),
+                                tmp.getCanonicalPath(),
+                                getTargetCompatibility(),
+                                getPackageName(),
+                                getServerpath(),
                                 configFiles,
-                                compileOptions.encoding
+                                getCompileOptions().getEncoding()
                         ]
 
                         prepareArguments(arguments)

diff --git a/...e-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GspCompileOptions.groovy b/...e-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GspCompileOptions.groovy
@@ -15,9 +15,6 @@
  */
 package org.grails.gradle.plugin.web.gsp
 
-import javax.inject.Inject
-
-import org.gradle.api.model.ObjectFactory
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Nested
 import org.gradle.api.tasks.compile.AbstractOptions
@@ -35,11 +32,6 @@ class GspCompileOptions extends AbstractOptions {
     String encoding = 'UTF-8'
 
     @Nested
-    GroovyForkOptions forkOptions = getObjectFactory().newInstance(GroovyForkOptions.class)
-
-    @Inject
-    protected ObjectFactory getObjectFactory() {
-        throw new UnsupportedOperationException();
-    }
+    GroovyForkOptions forkOptions = new GroovyForkOptions()
 
 }