Merge branch 'main' into feat/maven-build

diffplug · Jan 17, 2023 · ee44ee7 · ee44ee7
2 parents c51331d + 9f24a34
commit ee44ee7
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
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]
 ### Added
 * `ProcessRunner` has added some convenience methods so it can be used for maven testing. ([#1496](https://github.com/diffplug/spotless/pull/1496))
+### Fixed
+* The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
+### Changes
 
 ## [2.32.0] - 2023-01-13
 ### Added

diff --git a/gradle.properties b/gradle.properties
@@ -27,5 +27,5 @@ VER_SLF4J=[1.6,2.0[
 VER_DURIAN=1.2.0
 VER_JGIT=5.13.1.202206130422-r
 VER_JUNIT=5.9.2
-VER_ASSERTJ=3.24.1
+VER_ASSERTJ=3.24.2
 VER_MOCKITO=4.11.0
diff --git a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,6 +55,13 @@ public final class FormatAnnotationsStep {
 					"Acceleration",
 					"ACCTop",
 					"AinferBottom",
+					"AinferDefaultType",
+					"AinferParent",
+					"AinferSibling1",
+					"AinferSibling2",
+					"AinferTop",
+					"AinferImplicitAnno",
+					"AinferSiblingWithFields",
 					"AlwaysSafe",
 					"Angle",
 					"AnnoWithStringArg",
@@ -102,6 +109,7 @@ public final class FormatAnnotationsStep {
 					"DefaultType",
 					"degrees",
 					"Det",
+					"DoesNotMatchRegex",
 					"DotSeparatedIdentifiers",
 					"DotSeparatedIdentifiersOrPrimitiveType",
 					"DoubleVal",

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]
+### Added
+### Fixed
+* The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
+### Changes
 
 ## [6.13.0] - 2023-01-14
 ### Added

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]
+### Added
+### Fixed
+* The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
 * Spotless' custom build was replaced by [`maven-plugin-development`](https://github.com/britter/maven-plugin-development). ([#1496](https://github.com/diffplug/spotless/pull/1496) fixes [#554](https://github.com/diffplug/spotless/issues/554))