Add an option to use Ant for native2ascii to solve #9464

Author: graemerocher

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

@@ -16,6 +16,11 @@ class GrailsExtension {
      */
     boolean native2ascii = !Os.isFamily(Os.FAMILY_WINDOWS)
 
+    /**
+     * Whether to use Ant to do the conversion
+     */
+    boolean native2asciiAnt = false
+
     /**
      * Whether assets should be packaged in META-INF/assets for plugins
      */

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

@@ -16,6 +16,7 @@ import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.Dependency
 import org.gradle.api.file.CopySpec
 import org.gradle.api.plugins.GroovyPlugin
+import org.gradle.api.tasks.AbstractCopyTask
 import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.TaskContainer
@@ -31,6 +32,7 @@ import org.grails.gradle.plugin.agent.AgentTasksEnhancer
 import org.grails.gradle.plugin.commands.ApplicationContextCommandTask
 import org.grails.gradle.plugin.model.GrailsClasspathToolingModelBuilder
 import org.grails.gradle.plugin.run.FindMainClassTask
+import org.grails.gradle.plugin.util.SourceSets
 import org.grails.io.support.FactoriesLoaderSupport
 import org.springframework.boot.gradle.SpringBootPluginExtension
 
@@ -335,46 +337,73 @@ class GrailsGradlePlugin extends GroovyPlugin {
      **/
     protected void enableNative2Ascii(Project project, grailsVersion) {
         project.afterEvaluate {
-            for (SourceSet sourceSet in project.sourceSets) {
+            SourceSet sourceSet = SourceSets.findMainSourceSet(project)
 
-                project.tasks.getByName(sourceSet.processResourcesTaskName) { CopySpec task ->
-                    def grailsExt = project.extensions.getByType(GrailsExtension)
-//                    def destinationDir = ((ProcessResources) task).destinationDir
+            def taskContainer = project.tasks
 
-                    def replaceTokens = [
-                            'info.app.name': project.name,
-                            'info.app.version': project.version,
-                            'info.app.grailsVersion': grailsVersion
-                    ]
+            taskContainer.getByName(sourceSet.processResourcesTaskName) { AbstractCopyTask task ->
+
+                def grailsExt = project.extensions.getByType(GrailsExtension)
+                def native2ascii = grailsExt.native2ascii
+                if(native2ascii && grailsExt.native2asciiAnt && !taskContainer.findByName('native2ascii')) {
+                    def destinationDir = ((ProcessResources) task).destinationDir
+                    Task native2asciiTask = createNative2AsciiTask(taskContainer, project.file('grails-app/i18n'), destinationDir)
+                    task.dependsOn(native2asciiTask)
+                }
 
-                    task.from(project.relativePath("src/main/templates")) {
-                        into("META-INF/templates")
-                    }
 
+                def replaceTokens = [
+                        'info.app.name'         : project.name,
+                        'info.app.version'      : project.version,
+                        'info.app.grailsVersion': grailsVersion
+                ]
+
+                task.from(project.relativePath("src/main/templates")) {
+                    into("META-INF/templates")
+                }
+
+
+                if (!native2ascii) {
                     task.from(sourceSet.resources) {
                         include '**/*.properties'
-                        filter( ReplaceTokens, tokens: replaceTokens )
-                        if(grailsExt.native2ascii) {
-                            filter(EscapeUnicode)
-                        }
+                        filter(ReplaceTokens, tokens: replaceTokens)
                     }
+                }
+                else if(!grailsExt.native2asciiAnt) {
                     task.from(sourceSet.resources) {
-                        filter( ReplaceTokens, tokens: replaceTokens )
-                        include '**/*.groovy'
-                        include '**/*.yml'
-                        include '**/*.xml'
+                        include '**/*.properties'
+                        filter(ReplaceTokens, tokens: replaceTokens)
+                        filter(EscapeUnicode)
                     }
+                }
 
-                    task.from(sourceSet.resources) {
-                        exclude '**/*.properties'
-                        exclude '**/*.groovy'
-                        exclude '**/*.yml'
-                        exclude '**/*.xml'
-                    }
+                task.from(sourceSet.resources) {
+                    filter( ReplaceTokens, tokens: replaceTokens )
+                    include '**/*.groovy'
+                    include '**/*.yml'
+                    include '**/*.xml'
+                }
+
+                task.from(sourceSet.resources) {
+                    exclude '**/*.properties'
+                    exclude '**/*.groovy'
+                    exclude '**/*.yml'
+                    exclude '**/*.xml'
                 }
             }
         }
 
     }
 
+    protected Task createNative2AsciiTask(TaskContainer taskContainer, src, dest) {
+        def native2asciiTask = taskContainer.create('native2ascii')
+        native2asciiTask << {
+            ant.native2ascii(src: src, dest: dest,
+                    includes: "**/*.properties", encoding: "UTF-8")
+        }
+        native2asciiTask.inputs.dir(src)
+        native2asciiTask.outputs.dir(dest)
+        native2asciiTask
+    }
+
 }

grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/util/SourceSets.groovy

@@ -4,6 +4,7 @@ import groovy.transform.CompileStatic
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginConvention
 import org.gradle.api.tasks.SourceSet
+import org.gradle.api.tasks.SourceSetContainer
 
 /**
  * @author Graeme Rocher
@@ -18,8 +19,13 @@ class SourceSets {
      * @return The main source set or null if it can't be found
      */
     static SourceSet findMainSourceSet(Project project) {
+        SourceSetContainer sourceSets = findSourceSets(project)
+        return sourceSets?.find { SourceSet sourceSet -> sourceSet.name == SourceSet.MAIN_SOURCE_SET_NAME }
+    }
+
+    static SourceSetContainer findSourceSets(Project project) {
         JavaPluginConvention plugin = project.getConvention().getPlugin(JavaPluginConvention)
         def sourceSets = plugin?.sourceSets
-        return sourceSets?.find { SourceSet sourceSet -> sourceSet.name == SourceSet.MAIN_SOURCE_SET_NAME }
+        sourceSets
     }
 }