Merge pull request diffplug#205 from diffplug/bugfix-plugin-maven-depends-on-snapshots

nedtwigg · web-flow · commit 943882cfe4f7 · 2018-02-15T17:50:12.000-08:00
Fix problem where plugin-maven might be published with snapshot deps
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
@@ -2,6 +2,8 @@
 
 ### Version 1.10.0-SNAPSHOT - TBD ([javadoc](https://diffplug.github.io/spotless/javadoc/spotless-maven-plugin/snapshot/), [snapshot](https://oss.sonatype.org/content/repositories/snapshots/com/diffplug/spotless/spotless-maven-plugin/))
 
+* Fix build to ensure that published versions never have snapshot deps ([#205](https://github.com/diffplug/spotless/pull/205)).
+
 ### Version 1.0.0.BETA1 - February 11th 2017 ([javadoc](https://diffplug.github.io/spotless/javadoc/spotless-maven-plugin/1.0.0.BETA1/), [jcenter](https://bintray.com/diffplug/opensource/spotless-maven-plugin/1.0.0.BETA1))
 
 * Maven plugin written by [Konstantin Lutovich](https://github.com/lutovich).
diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
@@ -55,8 +55,14 @@ def mvnw(String args) {
 }
 
 dependencies {
-	compile project(":lib")
-	compile project(":lib-extra")
+	if (!project.versionMaven.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}"
+	} else {
+		compile project(':lib')
+		compile project(':lib-extra')
+	}
 	compileOnly "org.apache.maven:maven-plugin-api:${VER_MAVEN_API}"
 	compileOnly "org.apache.maven.plugin-tools:maven-plugin-annotations:${VER_MAVEN_API}"
 	compileOnly "org.eclipse.aether:aether-api:${VER_ECLIPSE_AETHER}"
