Moved GoogleJavaFormat into spotless-lib.

diffplug · Nov 30, 2016 · d4cf637 · d4cf637
1 parent 2b1b2c0
commit d4cf637
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/...radle/spotless/java/GoogleJavaFormat.java → ...fplug/spotless/java/GoogleJavaFormat.java b/...radle/spotless/java/GoogleJavaFormat.java → ...fplug/spotless/java/GoogleJavaFormat.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.gradle.spotless.java;
+package com.diffplug.spotless.java;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -26,8 +26,12 @@
 import com.diffplug.spotless.Provisioner;
 
 /** Wraps up [google-java-format](https://github.com/google/google-java-format) as a FormatterStep. */
-class GoogleJavaFormat {
-	static final String DEFAULT_VERSION = "1.1";
+public class GoogleJavaFormat {
+	public static final String defaultVersion() {
+		return DEFAULT_VERSION;
+	}
+
+	private static final String DEFAULT_VERSION = "1.1";
 	private static final String NAME = "google-java-format";
 	private static final String MAVEN_COORDINATE = "com.google.googlejavaformat:google-java-format:";
 	private static final String FORMATTER_CLASS = "com.google.googlejavaformat.java.Formatter";

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/java/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/java/JavaExtension.java
@@ -28,6 +28,7 @@
 import com.diffplug.gradle.spotless.LicenseHeaderStep;
 import com.diffplug.gradle.spotless.SpotlessExtension;
 import com.diffplug.spotless.SerializableFileFilter;
+import com.diffplug.spotless.java.GoogleJavaFormat;
 
 public class JavaExtension extends FormatExtension {
 	public static final String NAME = "java";
@@ -68,7 +69,7 @@ public void eclipseFormatFile(String eclipseVersion, Object eclipseFormatFile) {
 
 	/** Uses the [google-java-format](https://github.com/google/google-java-format) jar to format source code. */
 	public void googleJavaFormat() {
-		googleJavaFormat(GoogleJavaFormat.DEFAULT_VERSION);
+		googleJavaFormat(GoogleJavaFormat.defaultVersion());
 	}
 
 	/**

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/java/GoogleJavaFormatTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/java/GoogleJavaFormatTest.java
@@ -28,6 +28,7 @@
 import com.diffplug.gradle.spotless.GradleIntegrationTest;
 import com.diffplug.gradle.spotless.GradleProvisioner;
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.java.GoogleJavaFormat;
 
 public class GoogleJavaFormatTest extends GradleIntegrationTest {
 	@Test