Revert "Improve config of Groovy formatting"

This reverts commit 1adc60d.
ajoberstar · Dec 29, 2018 · 0acc025 · 0acc025
1 parent c806e80
commit 0acc025
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/groovy/org/ajoberstar/gradle/defaults/DefaultsPlugin.groovy b/src/main/groovy/org/ajoberstar/gradle/defaults/DefaultsPlugin.groovy
@@ -98,14 +98,16 @@ class DefaultsPlugin implements Plugin<Project> {
       }
       project.plugins.withId('groovy') {
         groovy {
-          excludeJava()
           importOrder 'java', 'javax', 'groovy', ''
+          removeUnusedImports()
           greclipse().configFile(project.rootProject.file('gradle/eclipse-java-formatter.xml'))
         }
       }
-      groovyGradle {
+      format 'gradle', {
         target '**/*.gradle'
-        greclipse().configFile(project.rootProject.file('gradle/eclipse-java-formatter.xml'))
+        trimTrailingWhitespace()
+        indentWithSpaces(2)
+        endWithNewline()
       }
     }
   }