activate removeWildcardImports()

Author: Vincent Potucek

gradle/spotless.gradle

@@ -1,19 +1,7 @@
 apply plugin: 'com.diffplug.spotless'
 spotless {
-	def noInternalDepsClosure = {
-		String text = it
-		/*
-		 * No good way to get around using this import:
-		 * https://github.com/gradle/gradle/issues/3191
-		 */
-		String regex = "import org\\.gradle\\.api\\.internal\\.(?!plugins\\.DslObject)(?!project\\.ProjectInternal)"
-		if ((text.contains('import org.gradle.internal.') || text.find(regex)) &&
-				!text.contains('def noInternalDepsClosure')) {
-			throw new AssertionError("Accidental internal import")
-		}
-	}
+	// the rootProject doesn't have any java
 	if (project != rootProject) {
-		// the rootProject doesn't have any java
 		java {
 			ratchetFrom 'origin/main'
 			bumpThisNumberIfACustomStepChanges(1)
@@ -22,8 +10,20 @@ spotless {
 			eclipse().configFile rootProject.file('gradle/spotless.eclipseformat.xml')
 			trimTrailingWhitespace()
 			removeUnusedImports()
-			// TODO: formatAnnotations()
-			custom 'noInternalDeps', noInternalDepsClosure
+			removeWildcardImports()
+			formatAnnotations()
+			custom 'noInternalDeps', {
+				/*
+				 * No good way to get around using this import:
+				 * https://github.com/gradle/gradle/issues/3191
+				 */
+				var regex = "import org\\.gradle\\.api\\.internal\\.(?!plugins\\.DslObject)(?!project\\.ProjectInternal)"
+				if (it.contains('import org.gradle.internal.')
+					|| it.find(regex as Closure)
+					&& !it.contains('def noInternalDepsClosure')) {
+					throw new AssertionError("Accidental internal import")
+				}
+			}
 		}
 	}
 	groovyGradle {