Fixes according to review by @jbduncan (as far as possible, using the greclipse formatter)

Author: fvgh

gradle/java-publish.gradle

@@ -127,7 +127,9 @@ if (!ext.isSnapshot) {
 	bintray {
 		user = cred('bintray_user')
 		key = cred('bintray_pass')
-		publications = ['pluginMaven']
+		publications = [
+			'pluginMaven'
+		]
 		publish = true
 		pkg {
 			repo = 'opensource'

gradle/java-setup.gradle

@@ -35,7 +35,9 @@ apply plugin: 'findbugs'
 findbugs {
 	toolVersion = VER_FINDBUGS
 	sourceSets = [
-		sourceSets.main]	// don't check the test code
+		// don't check the test code
+		sourceSets.main
+	]
 	ignoreFailures = false 	// bug free or it doesn't ship!
 	reportsDir = file('build/findbugs')
 	effort = 'max'			// min|default|max

lib-extra/build.gradle

@@ -22,5 +22,5 @@ dependencies {
 }
 
 // we'll hold the core lib to a high standard
-findbugs { reportLevel = 'low' // low|medium|high (low = sensitive to even minor mistakes)
-}
+findbugs { reportLevel = 'low' } // low|medium|high (low = sensitive to even minor mistakes)
+

lib/build.gradle

@@ -12,5 +12,4 @@ dependencies {
 }
 
 // we'll hold the core lib to a high standard
-findbugs { reportLevel = 'low' // low|medium|high (low = sensitive to even minor mistakes)
-}
+findbugs { reportLevel = 'low' } // low|medium|high (low = sensitive to even minor mistakes)

spotless.groovyformat.prefs

@@ -1 +1,2 @@
-groovy.formatter.remove.unnecessary.semicolons=true
+groovy.formatter.remove.unnecessary.semicolons=true
+groovy.formatter.longListLength=1

spotlessSelf.gradle

@@ -6,18 +6,19 @@ plugins {
 
 repositories { jcenter() }
 spotless {
+	def noInternalDepsClosure = {
+		if (it.contains('import org.gradle.internal.') &&
+		!it.contains('def noInternalDepsClosure')) {
+			throw new AssertionError("Accidental internal import")
+		}
+	}
 	java {
 		target fileTree('.') {
 			include '**/*.java'
 			exclude '_ext/*/build/**'
 		}
-		custom 'noInternalDeps', {
-			if (it.contains('import org.gradle.internal.')) {
-				throw new AssertionError("Accidental internal import")
-			}
-		}
+		custom 'noInternalDeps', noInternalDepsClosure
 		bumpThisNumberIfACustomStepChanges(1)
-
 		licenseHeaderFile 'spotless.license'
 		importOrderFile   'spotless.importorder'
 		eclipseFormatFile 'spotless.eclipseformat.xml'
@@ -28,7 +29,9 @@ spotless {
 			include '**/*.gradle'
 			exclude '_ext/**'
 		}
+		custom 'noInternalDeps', noInternalDepsClosure
 		custom 'preventFormatPingPong', { return it.replaceAll('}[ \t\f]+}', '}}') }
+		bumpThisNumberIfACustomStepChanges(1)
 		greclipseFormat().configFile('spotless.eclipseformat.xml', 'spotless.groovyformat.prefs')
 	}
 	freshmark {

testlib/build.gradle

@@ -13,5 +13,5 @@ dependencies {
 }
 
 // we'll hold the testlib to a low standard (prize brevity)
-findbugs { reportLevel = 'high' // low|medium|high (low = sensitive to even minor mistakes)
-}
+findbugs { reportLevel = 'high' } // low|medium|high (low = sensitive to even minor mistakes)
+