From 0acc025ee00a4402229d2b22a24ea8c06a0c0efc Mon Sep 17 00:00:00 2001
From: Andrew Oberstar <ajoberstar@gmail.com>
Date: Sat, 29 Dec 2018 12:38:53 -0600
Subject: [PATCH] Revert "Improve config of Groovy formatting"

This reverts commit 1adc60dd1460aafd4707a9418769ed771c130ea1.
---
 .../org/ajoberstar/gradle/defaults/DefaultsPlugin.groovy  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/groovy/org/ajoberstar/gradle/defaults/DefaultsPlugin.groovy b/src/main/groovy/org/ajoberstar/gradle/defaults/DefaultsPlugin.groovy
index 53d438e..8cb7aed 100644
--- 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()
       }
     }
   }