Merge branch 'renovate/ver_ktfmt' into main-ktlint-versions

.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  win: circleci/windows@2.4.0
+  win: circleci/windows@2.4.1
 
 anchors:
   env_gradle: &env_gradle

CHANGES.md

@@ -10,6 +10,10 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* `formatAnnotations()` step to correct formatting of Java type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
+### Changes
+* Bump default `ktfmt` version to latest `0.39` -> `0.40` ([#1312](https://github.com/diffplug/spotless/pull/1312))
 
 ### Changes
 * Extend minimum supported version for `ktlint` to `0.31.0` ([#1303](https://github.com/diffplug/spotless/pull/1303)).

CONTRIBUTING.md

@@ -129,7 +129,7 @@ The `_ext` projects are disabled per default, since:
 
 The `_ext` can be activated via the root project property `com.diffplug.spotless.include.ext`.
 
-Activate the the property via command line, like for example:
+Activate the property via command line, like for example:
 
 ```
 gradlew -Pcom.diffplug.spotless.include.ext=true build

README.md

@@ -61,6 +61,7 @@ lib('java.ImportOrderStep')                      +'{{yes}}       | {{yes}}
 lib('java.PalantirJavaFormatStep')               +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('java.RemoveUnusedImportsStep')              +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 extra('java.EclipseJdtFormatterStep')            +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
+lib('java.FormatAnnotationsStep')                +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('json.gson.GsonStep')                        +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('json.JsonSimpleStep')                       +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('kotlin.KtLintStep')                         +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
@@ -104,6 +105,7 @@ extra('wtp.EclipseWtpFormatterStep')             +'{{yes}}       | {{yes}}
 | [`java.PalantirJavaFormatStep`](lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`java.RemoveUnusedImportsStep`](lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`java.EclipseJdtFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
+| [`java.FormatAnnotationsStep`](lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`json.gson.GsonStep`](lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`json.JsonSimpleStep`](lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`kotlin.KtLintStep`](lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |

_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseFramework.java

@@ -61,7 +61,7 @@ public enum DefaultBundles {
 		REGISTRY(org.eclipse.core.internal.registry.osgi.Activator.class),
 		/** Eclipse preferences always check whether this bundle has been activated before preference are set.*/
 		PREFERENCES(org.eclipse.core.internal.preferences.Activator.class),
-		/** The common runtime provides provides common services, like log and service adapters registry. */
+		/** The common runtime provides common services, like log and service adapters registry. */
 		COMMON(org.eclipse.core.internal.runtime.Activator.class);
 
 		private final Class<? extends BundleActivator> activatorClass;

_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleController.java

@@ -76,7 +76,7 @@ public BundleController() throws BundleException {
 		services.add(org.osgi.service.packageadmin.PackageAdmin.class, bundleLookup);
 		services.add(FrameworkWiring.class, bundleLookup);
 
-		//Redirect framework activator requests to the the org.eclipse.osgi bundle to this instance.
+		//Redirect framework activator requests to the org.eclipse.osgi bundle to this instance.
 		bundles.add(new SimpleBundle(systemBundle, ECLIPSE_LAUNCHER_SYMBOLIC_NAME, Bundle.ACTIVE));
 		FrameworkBundleRegistry.initialize(this);
 	}

_ext/eclipse-groovy/README.md

@@ -5,7 +5,7 @@ To fix this, we publish Groovy-Eclipse's formatter and all its dependencies, alo
 
 ## Build
 
-To publish a new version, update the `_ext/eclipse-groovy/gradle.properties` appropriately and and see [CONTRIBUTING.md](../../CONTRIBUTING.md) how to enable
+To publish a new version, update the `_ext/eclipse-groovy/gradle.properties` appropriately and see [CONTRIBUTING.md](../../CONTRIBUTING.md) how to enable
 `_ext` projects.
 
 ## License

_ext/eclipse-jdt/README.md

@@ -4,7 +4,7 @@ Eclipse JDT and its dependencies require a large amount of byte code.
 Hence they should not be directly be required by the Spotless, but only be requested in case
 they are configured by the Spotless configuration. Hence we publish Eclipse's formatter and all its dependencies, along with a small amount of glue code, into the `com.diffplug.gradle.spotless:spotless-eclipse-jdt` artifact.
 
-To publish a new version, update the `_ext/eclipse-jdt/gradle.properties` appropriately and and see [CONTRIBUTING.md](../../CONTRIBUTING.md) how to enable
+To publish a new version, update the `_ext/eclipse-jdt/gradle.properties` appropriately and see [CONTRIBUTING.md](../../CONTRIBUTING.md) how to enable
 `_ext` projects.
 
 ## License

_ext/eclipse-wtp/README.md

@@ -2,7 +2,7 @@
 
 Eclipse WTP is not available in a form which can be easily consumed by maven or gradle. To fix this, we publish Eclipse's WTP formatters, along with a small amount of glue code, into the `com.diffplug.spotless.extra:spotless-eclipse-wtp` artifact.
 
-To publish a new version, update the `_ext/eclipse-wtp/gradle.properties` appropriately and and see [CONTRIBUTING.md](../../CONTRIBUTING.md) how to enable
+To publish a new version, update the `_ext/eclipse-wtp/gradle.properties` appropriately and see [CONTRIBUTING.md](../../CONTRIBUTING.md) how to enable
 `_ext` projects.
 
 ## License

_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/PluginPreferences.java

@@ -33,7 +33,7 @@
 import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
 
 /**
- * The plugin preference configuration of most WTP formatters is accomplished via the the
+ * The plugin preference configuration of most WTP formatters is accomplished via the
  * globabl Eclipse preference lookup.
  * Spotless allows different formatter configurations per sub-projects.
  * Fortunately most formatters only perform a lookup on instantiation and not afterwards.

gradle.properties

@@ -25,8 +25,8 @@ VER_SLF4J=[1.6,2.0[
 
 # Used in multiple places
 VER_DURIAN=1.2.0
-VER_JGIT=5.13.0.202109080827-r
-VER_JUNIT=5.8.0
+VER_JGIT=5.13.1.202206130422-r
+VER_JUNIT=5.9.0
 VER_ASSERTJ=3.15.0
 VER_MOCKITO=3.3.3
 

gradle/spotless-freshmark.gradle

@@ -75,7 +75,7 @@ if (tasks.names.contains('changelogCheck')) {
 	changelogBumpFreshmark.dependsOn tasks.named('changelogBump')
 
 	def changelogBumpFreshmarkGitAdd = tasks.register('changelogBumpFreshmarkGitAdd') {
-		// this git add add should run after the freshmark
+		// this git add should run after the freshmark
 		dependsOn(changelogBumpFreshmark)
 		// do the git add
 		doLast {

gradle/spotless.gradle

@@ -22,6 +22,7 @@ spotless {
 			eclipse().configFile rootProject.file('gradle/spotless.eclipseformat.xml')
 			trimTrailingWhitespace()
 			removeUnusedImports()
+			// TODO: formatAnnotations()
 			custom 'noInternalDeps', noInternalDepsClosure
 		}
 	}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

lib/build.gradle

@@ -54,7 +54,7 @@ dependencies {
 
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0'
 
-	String VER_KTFMT = '0.39'
+	String VER_KTFMT = '0.40'
 	ktfmtCompileOnly "com.facebook:ktfmt:$VER_KTFMT"
 	String VER_KTLINT_GOOGLE_JAVA_FORMAT = '1.7' // for JDK 8 compatibility
 	ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {

lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.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.
@@ -30,7 +30,7 @@
  * This class loader is used to load classes of Spotless features from a search
  * path of URLs.<br/>
  * Features shall be independent from build tools. Hence the class loader of the
- * underlying build tool is e.g. skipped during the the search for classes.<br/>
+ * underlying build tool is e.g. skipped during the search for classes.<br/>
  *
  * For `com.diffplug.spotless.glue.`, classes are redefined from within the lib jar
  * but linked against the `Url[]`. This allows us to ship classfiles which function as glue

lib/src/main/java/com/diffplug/spotless/PaddedCell.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.
@@ -236,7 +236,7 @@ public static DirtyState calculateDirtyState(Formatter formatter, File file, byt
 
 	/**
 	 * The clean/dirty state of a single file.  Intended use:
-	 * - {@link #isClean()} means that the file is is clean, and there's nothing else to say
+	 * - {@link #isClean()} means that the file is clean, and there's nothing else to say
 	 * - {@link #didNotConverge()} means that we were unable to determine a clean state
 	 * - once you've tested the above conditions and you know that it's a dirty file with a converged state,
 	 *   then you can call {@link #writeCanonicalTo(OutputStream)} to get the canonical form of the given file.