Merge pull request #430 from diffplug/feature/buildCleanup

Feature/build cleanup

Author: nedtwigg

build.gradle

@@ -5,18 +5,28 @@ buildscript {
 		}
 	}
 	dependencies {
-		classpath "com.diffplug.gradle:goomph:${VER_GOOMPH}"
-		classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:${VER_BINTRAY}"
-		classpath "com.gradle.publish:plugin-publish-plugin:${VER_PLUGIN_PUBLISH}"
-		classpath "org.ajoberstar:gradle-git-publish:${VER_GRADLE_GIT}"
-		classpath "ch.raffael.pegdown-doclet:pegdown-doclet:${VER_PEGDOWN_DOCLET}"
 		classpath "gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:${VER_SPOTBUGS_PLUGIN}"
 		classpath "com.google.guava:guava:27.1-jre" // Force newer version for spotbugs
-		classpath "com.gradle:build-scan-plugin:${VER_BUILDSCAN_PLUGIN}"
 	}
 }
 
-apply plugin: 'com.gradle.build-scan'
+plugins {
+	// dependencyUpdates https://github.com/ben-manes/gradle-versions-plugin/releases
+	id 'com.github.ben-manes.versions' version '0.22.0'
+	// https://github.com/diffplug/goomph/blob/master/CHANGES.md
+	id 'com.diffplug.gradle.eclipse.resourcefilters' version '3.18.0'
+	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
+	id 'com.gradle.plugin-publish' version '0.10.1' apply false
+	// https://plugins.gradle.org/plugin/com.gradle.build-scan
+	id 'com.gradle.build-scan' version '2.4'
+	// https://github.com/bintray/gradle-bintray-plugin/releases
+	id 'com.jfrog.bintray' version '1.8.4' apply false
+	// https://github.com/mnlipp/jdrupes-mdoclet/releases
+	id 'org.jdrupes.mdoclet' version '1.0.5' apply false
+	// https://github.com/ajoberstar/gradle-git-publish/releases
+	id 'org.ajoberstar.git-publish' version '2.1.1' apply false
+}
+
 buildScan {
 	termsOfServiceUrl = 'https://gradle.com/terms-of-service'
 	apply from: 'gradle/build-scans.gradle'

gradle.properties

@@ -23,12 +23,6 @@ artifactIdGradle=spotless-plugin-gradle
 VER_JAVA=1.8
 VER_SPOTBUGS=3.1.6
 VER_SPOTBUGS_PLUGIN=2.0.0
-VER_BINTRAY=1.7.3
-VER_PLUGIN_PUBLISH=0.9.7
-VER_GOOMPH=3.17.4
-VER_GRADLE_GIT=2.1.1
-VER_PEGDOWN_DOCLET=1.3
-VER_BUILDSCAN_PLUGIN=2.0.2
 
 # Used in multiple places
 VER_DURIAN=1.2.0

gradle/java-publish.gradle

@@ -23,7 +23,7 @@ def javadocInfo = '<h2>' + makeLink("https://github.com/${org}/${name}", "${grou
 		' by ' + makeLink('https://www.diffplug.com', 'DiffPlug') + '</h2>'
 
 String version_str = ext.version.endsWith('-SNAPSHOT') ? 'snapshot' : ext.version
-apply plugin: 'ch.raffael.pegdown-doclet'
+apply plugin: 'org.jdrupes.mdoclet'
 javadoc {
 	// Where it's possible to name parameters and methods clearly enough
 	// that javadoc is not necessary, why make the code bigger?

lib-extra/build.gradle

@@ -1,18 +1,22 @@
+plugins {
+	id 'java-library'
+}
+
 ext.artifactId = project.artifactIdLibExtra
 ext.version = project.versionLib
 apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
 dependencies {
-	compile project(':lib')
+	api project(':lib')
 	// misc useful utilities
-	compile "com.diffplug.durian:durian-core:${VER_DURIAN}"
-	compile "com.diffplug.durian:durian-collect:${VER_DURIAN}"
+	implementation "com.diffplug.durian:durian-core:${VER_DURIAN}"
+	implementation "com.diffplug.durian:durian-collect:${VER_DURIAN}"
 	// needed by GitAttributesLineEndings
-	compile "org.eclipse.jgit:org.eclipse.jgit:5.3.2.201906051522-r"
-	compile "com.googlecode.concurrent-trees:concurrent-trees:2.6.1"
+	implementation "org.eclipse.jgit:org.eclipse.jgit:5.3.2.201906051522-r"
+	implementation "com.googlecode.concurrent-trees:concurrent-trees:2.6.1"
 	// used for xml parsing in EclipseFormatter
-	compile "org.codehaus.groovy:groovy-xml:2.4.7"
+	implementation "org.codehaus.groovy:groovy-xml:2.4.7"
 
 	// testing
 	testImplementation project(':testlib')

lib/build.gradle

@@ -1,3 +1,6 @@
+plugins {
+	id 'java-library'
+}
 ext.artifactId = project.artifactIdLib
 ext.version = project.versionLib
 apply from: rootProject.file('gradle/java-setup.gradle')

plugin-gradle/build.gradle

@@ -3,20 +3,22 @@ ext.version = project.versionGradle
 apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
+apply plugin: 'java-library'
 apply plugin: 'com.gradle.plugin-publish'
 apply plugin: 'java-gradle-plugin'
 
 dependencies {
 	if (!project.versionGradle.endsWith('-SNAPSHOT') && project.versionLib.endsWith('-SNAPSHOT')) {
 		// gradle = release, lib = snapshot, therefore gradle should depend on the last stable lib
-		compile "com.diffplug.spotless:spotless-lib:${project.stableLib}"
-		compile "com.diffplug.spotless:spotless-lib-extra:${project.stableLib}"
+		api "com.diffplug.spotless:spotless-lib:${project.stableLib}"
+		api "com.diffplug.spotless:spotless-lib-extra:${project.stableLib}"
 	} else {
-		compile project(':lib')
-		compile project(':lib-extra')
+		api project(':lib')
+		api project(':lib-extra')
 	}
-	compile "com.diffplug.durian:durian-core:${VER_DURIAN}"
-	compile "com.diffplug.durian:durian-io:${VER_DURIAN}"
+	implementation "com.diffplug.durian:durian-core:${VER_DURIAN}"
+	implementation "com.diffplug.durian:durian-io:${VER_DURIAN}"
+	implementation "com.diffplug.durian:durian-collect:${VER_DURIAN}"
 
 	testImplementation project(':testlib')
 	testImplementation "junit:junit:${VER_JUNIT}"

plugin-maven/build.gradle

@@ -72,10 +72,14 @@ dependencies {
 	compileOnly "org.eclipse.aether:aether-api:${VER_ECLIPSE_AETHER}"
 	compileOnly "org.eclipse.aether:aether-util:${VER_ECLIPSE_AETHER}"
 
+	implementation "com.diffplug.durian:durian-core:${VER_DURIAN}"
+	implementation "com.diffplug.durian:durian-collect:${VER_DURIAN}"
+
 	testImplementation project(":testlib")
 	testImplementation "junit:junit:${VER_JUNIT}"
 	testImplementation "org.assertj:assertj-core:${VER_ASSERTJ}"
 	testImplementation "org.mockito:mockito-core:${VER_MOCKITO}"
+	testImplementation "com.diffplug.durian:durian-io:${VER_DURIAN}"
 	testImplementation "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
 	testImplementation "com.github.spullara.mustache.java:compiler:${VER_MUSTACHE}"
 	testImplementation "org.apache.maven:maven-plugin-api:${VER_MAVEN_API}"
@@ -146,7 +150,6 @@ task createPomXml(dependsOn: installLocalDependencies) {
 			mavenApiVersion           : VER_MAVEN_API,
 			eclipseAetherVersion      : VER_ECLIPSE_AETHER,
 			spotlessLibVersion        : project.versionLib,
-			plexusResourcesVersion    : VER_PLEXUS_RESOURCES,
 			additionalDependencies    : additionalDependencies
 		]
 

plugin-maven/src/main/java/com/diffplug/spotless/maven/ArtifactResolver.java

@@ -57,7 +57,7 @@ public ArtifactResolver(RepositorySystem repositorySystem, RepositorySystemSessi
 		this.log = Objects.requireNonNull(log);
 	}
 
-	/** Use {@link ArtifactResolver#resolve(boolean, Collection)) instead.} */
+	/** Use {@link ArtifactResolver#resolve(boolean, Collection)} instead. */
 	@Deprecated
 	public Set<File> resolve(String mavenCoordinate) {
 		return resolve(true, Arrays.asList(mavenCoordinate));

plugin-maven/src/test/resources/pom-build.xml.mustache

@@ -23,7 +23,6 @@
     <maven.api.version>{{mavenApiVersion}}</maven.api.version>
     <eclipse.aether.version>{{eclipseAetherVersion}}</eclipse.aether.version>
     <spotless.lib.version>{{spotlessLibVersion}}</spotless.lib.version>
-    <plexus.resources.version>{{plexusResourcesVersion}}</plexus.resources.version>
   </properties>
 
   <dependencies>
@@ -51,11 +50,6 @@
       <version>${eclipse.aether.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-resources</artifactId>
-      <version>${plexus.resources.version}</version>
-    </dependency>
 
     <dependency>
       <groupId>com.diffplug.spotless</groupId>

testlib/build.gradle

@@ -1,16 +1,20 @@
+plugins {
+	id 'java-library'
+}
 ext.artifactId = project.artifactIdTestLib
 ext.version = project.versionLib
 apply from: rootProject.file('gradle/java-setup.gradle')
 
 dependencies {
-	compile project(':lib')
-	compile "com.diffplug.durian:durian-core:${VER_DURIAN}"
-	compile "com.diffplug.durian:durian-io:${VER_DURIAN}"
-	compile "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
-	compile "com.diffplug.durian:durian-collect:${VER_DURIAN}"
-	compile "junit:junit:${VER_JUNIT}"
-	compile "org.assertj:assertj-core:${VER_ASSERTJ}"
-	compile gradleTestKit()
+	api project(':lib')
+	api "com.diffplug.durian:durian-core:${VER_DURIAN}"
+	api "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
+	api "junit:junit:${VER_JUNIT}"
+	api "org.assertj:assertj-core:${VER_ASSERTJ}"
+
+	implementation "com.diffplug.durian:durian-io:${VER_DURIAN}"
+	implementation "com.diffplug.durian:durian-collect:${VER_DURIAN}"
+	implementation gradleTestKit()
 }
 
 // we'll hold the testlib to a low standard (prize brevity)

testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java

@@ -46,7 +46,7 @@ public class ResourceHarness {
 	 * On OS X, the temp folder is a symlink,
 	 * and some of gradle's stuff breaks symlinks.
 	 * By only accessing it through the {@link #rootFolder()}
-	 * and {@link #newFile()} apis, we can guarantee there
+	 * and {@link #newFile(String)} apis, we can guarantee there
 	 * will be no symlink problems.
 	 */
 	@Rule