From a84b6bb12db19fce1b16d2aa132d971abe70bf58 Mon Sep 17 00:00:00 2001
From: Ben Soares <bsoares@dundee.ac.uk>
Date: Tue, 24 Sep 2019 15:05:49 +0100
Subject: [PATCH] JAL-3438 First config attempt for spotless code
 reformatting. Still differences to be ironed out

---
 build.gradle      |   16 +++++++++++++++-
 gradle.properties |    4 +++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index f02d8ad..e3c4675 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,6 +19,7 @@ plugins {
   id 'eclipse'
   id 'com.github.johnrengelman.shadow' version '4.0.3'
   id 'com.install4j.gradle' version '7.0.9'
+  id 'com.diffplug.gradle.spotless' version '3.24.2'
 }
 
 repositories {
@@ -492,7 +493,6 @@ task cloverReport {
 
 // end clover bits
 
-
 compileJava {
 
   doFirst {
@@ -1170,7 +1170,16 @@ clean {
   delete install4jConf
 }
 
+spotless {
+  java {
+    removeUnusedImports()
+    importOrder 'jalview', 'java', 'javax', 'org', 'com'
+    eclipse(spotless_eclipse_version).configFile eclipse_jdt_prefs_file
+  }
+}
+
 task sourceDist (type: Tar) {
+  dependsOn 'spotlessApply'
   
   def VERSION_UNDERSCORES = JALVIEW_VERSION.replaceAll("\\.", "_")
   def outputFileName = project.name + "_" + VERSION_UNDERSCORES + ".tar.gz"
@@ -1247,3 +1256,8 @@ task helppages  {
   inputs.dir("$classes/$helpDir")
   outputs.dir("$helpOutputDir")
 }
+
+
+project.afterEvaluate {
+  tasks.findByName('spotlessApply').dependsOn eclipseJdt
+}
diff --git a/gradle.properties b/gradle.properties
index 2dbdad3..45bf3ca 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -121,7 +121,9 @@ OSX_KEYSTORE =
 OSX_KEYPASS =
 JSIGN_SH = echo
 
+spotless_eclipse_version = 4.10.0
 eclipse_extra_jdt_prefs_file = .settings/org.eclipse.jdt.core.jalview.prefs
+eclipse_jdt_prefs_file = .settings/org.eclipse.jdt.core.prefs
 
 pandoc_exec = /usr/local/bin/pandoc,/usr/bin/pandoc
 dev = false
@@ -139,4 +141,4 @@ RUNRSYNC=false
 bamboo_channelbase = https://builds.jalview.org/browse
 bamboo_planKey = 
 bamboo_getdown_channel_suffix = /latest/artifact/shared/getdown-channel
- 
\ No newline at end of file
+ 
-- 
1.7.10.2