Bump default versions (#1095)

diffplug · Jan 14, 2022 · 48723eb · 48723eb
2 parents 32bdfc6 + 4f79418
commit 48723eb
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -34,8 +34,8 @@ anchors:
       - *restore_cache_wrapper
       - *restore_cache_deps
       - run:
-          name: gradlew check
-          command: export SPOTLESS_EXCLUDE_MAVEN=true && ./gradlew check --build-cache
+          name: gradlew check -x spotlessCheck
+          command: export SPOTLESS_EXCLUDE_MAVEN=true && ./gradlew check -x spotlessCheck --build-cache
       - store_test_results:
           path: testlib/build/test-results/test
       - store_test_results:

diff --git a/CHANGES.md b/CHANGES.md
@@ -12,6 +12,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changed
 * Bump CI from Java 15 to 17 ([#1094](https://github.com/diffplug/spotless/pull/1094)).
+* Bump default versions of formatters ([#1095](https://github.com/diffplug/spotless/pull/1095)).
+  * google-java-format `1.12.0` -> `1.13.0`
+  * ktfmt `0.29` -> `0.30`
 
 ## [2.22.0] - 2022-01-13
 ### Added

diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -93,7 +93,7 @@ public static FormatterStep create(String groupArtifact, String version, String
 				State::createFormat);
 	}
 
-	static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.7").add(11, "1.12.0");
+	static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.7").add(11, "1.13.0");
 
 	public static String defaultGroupArtifact() {
 		return MAVEN_COORDINATE;

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ public class KtfmtStep {
 	// prevent direct instantiation
 	private KtfmtStep() {}
 
-	private static final String DEFAULT_VERSION = "0.29";
+	private static final String DEFAULT_VERSION = "0.30";
 	static final String NAME = "ktfmt";
 	static final String PACKAGE = "com.facebook";
 	static final String MAVEN_COORDINATE = PACKAGE + ":ktfmt:";

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
@@ -3,6 +3,10 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Changed
+* Bump default versions of formatters ([#1095](https://github.com/diffplug/spotless/pull/1095)).
+  * google-java-format `1.12.0` -> `1.13.0`
+  * ktfmt `0.29` -> `0.30`
 
 ## [6.2.0] - 2022-01-13
 ### Added

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
@@ -328,7 +328,7 @@ spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
 ```kotlin
 spotless {
   kotlin {
-    ktfmt('0.15').dropboxStyle() // version and dropbox style are optional
+    ktfmt('0.30').dropboxStyle() // version and dropbox style are optional
 ```
 
 <a name="applying-ktlint-to-kotlin-files"></a>
@@ -341,7 +341,7 @@ spotless {
 spotless {
   kotlin {
     // version and userData are both optional
-    ktlint('0.37.2').userData(mapOf('indent_size' to '2', 'continuation_indent_size' to '2'))
+    ktlint('0.43.2').userData(mapOf('indent_size' to '2', 'continuation_indent_size' to '2'))
 ```
 
 ### diktat
@@ -352,7 +352,7 @@ spotless {
 spotless {
   kotlin {
     // version and configFile are both optional
-    diktat('0.4.0').configFile("full/path/to/diktat-analysis.yml")
+    diktat('1.0.1').configFile("full/path/to/diktat-analysis.yml")
 ```
 
 <a name="applying-scalafmt-to-scala-files"></a>

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
@@ -3,6 +3,9 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+* Bump default versions of formatters ([#1095](https://github.com/diffplug/spotless/pull/1095)).
+  * google-java-format `1.12.0` -> `1.13.0`
+  * ktfmt `0.29` -> `0.30`
 
 ## [2.20.0] - 2022-01-13
 ### Added

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
@@ -329,7 +329,7 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ```xml
 <ktfmt>
-  <version>0.18</version> <!-- optional -->
+  <version>0.30</version> <!-- optional -->
   <style>DEFAULT</style> <!-- optional, other option is DROPBOX -->
 </ktfmt>
 ```
@@ -342,7 +342,7 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ```xml
 <ktlint>
-  <version>0.37.2</version> <!-- optional -->
+  <version>0.43.2</version> <!-- optional -->
 </ktlint>
 ```
 
@@ -352,7 +352,7 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ```xml
 <diktat>
-  <version>0.4.0</version> <!-- optional -->
+  <version>1.0.1</version> <!-- optional -->
   <configFile>full/path/to/diktat-analysis.yml</configFile> <!-- optional, configuration file path -->
 </diktat>
 ```