From 956aeeb46e79ae327c70105522c7bf725b3b4e36 Mon Sep 17 00:00:00 2001 From: Andrew Oberstar Date: Sat, 29 Dec 2018 12:40:04 -0600 Subject: [PATCH] Revert "Use greclipse formatter" This reverts commit 59b499f5c188a826d3aa65c263457ae9293718b4. --- .../org/ajoberstar/gradle/defaults/DefaultsPlugin.groovy | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/groovy/org/ajoberstar/gradle/defaults/DefaultsPlugin.groovy b/src/main/groovy/org/ajoberstar/gradle/defaults/DefaultsPlugin.groovy index 8cb7aed..fe825c5 100644 --- a/src/main/groovy/org/ajoberstar/gradle/defaults/DefaultsPlugin.groovy +++ b/src/main/groovy/org/ajoberstar/gradle/defaults/DefaultsPlugin.groovy @@ -97,10 +97,11 @@ class DefaultsPlugin implements Plugin { } } project.plugins.withId('groovy') { - groovy { - importOrder 'java', 'javax', 'groovy', '' - removeUnusedImports() - greclipse().configFile(project.rootProject.file('gradle/eclipse-java-formatter.xml')) + format 'groovy', { + target 'src/**/*.groovy' + trimTrailingWhitespace() + indentWithSpaces(2) + endWithNewline() } } format 'gradle', {