Skip to content

Commit 9984f84

Browse files
Excavator: Upgrades Baseline to the latest version (#1322)
1 parent 6ea3018 commit 9984f84

File tree

30 files changed

+8
-48
lines changed

30 files changed

+8
-48
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
dependencies {
88
classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.6.0'
99
classpath 'com.gradle.publish:plugin-publish-plugin:1.3.1'
10-
classpath 'com.palantir.baseline:gradle-baseline-java:6.35.0'
10+
classpath 'com.palantir.baseline:gradle-baseline-java:6.36.0'
1111
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.34.0'
1212
classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.19.0'
1313
classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.14.0'

eclipse_plugin/src/main/java/com/palantir/javaformat/java/PalantirJavaFormatter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public String createIndentationString(int indentationLevel) {
6060
}
6161

6262
/** Runs the Google Java formatter on the given source, with only the given ranges specified. */
63-
@SuppressWarnings({"for-rollout:DefaultLocale", "for-rollout:StatementSwitchToExpressionSwitch"})
63+
@SuppressWarnings("for-rollout:StatementSwitchToExpressionSwitch")
6464
@Nullable
6565
private TextEdit formatInternal(int kind, String source, IRegion[] regions, int initialIndent) {
6666
try {

eclipse_plugin/src/main/java/com/palantir/javaformat/java/SnippetFormatter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ private static List<Replacement> toReplacements(String source, String replacemen
153153
return replacements;
154154
}
155155

156-
@SuppressWarnings({"for-rollout:StatementSwitchToExpressionSwitch", "for-rollout:UnnecessaryDefaultInEnumSwitch"})
156+
@SuppressWarnings("for-rollout:StatementSwitchToExpressionSwitch")
157157
private SnippetWrapper snippetWrapper(SnippetKind kind, String source, int initialIndent) {
158158
/*
159159
* Synthesize a dummy class around the code snippet provided by Eclipse. The

gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/ExecutableTransform.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
*/
4242
public abstract class ExecutableTransform implements TransformAction<TransformParameters.None> {
4343

44-
@SuppressWarnings("for-rollout:NonFinalStaticField")
4544
private static Logger logger = Logging.getLogger(ExecutableTransform.class);
4645

4746
@InputArtifact

gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/FormatDiff.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ public static void formatDiff(Path dirToFormat, FormatterService formatter)
6969
}
7070

7171
/** Parses the filenames and edited ranges out of `git diff -U0`. */
72-
@SuppressWarnings("for-rollout:SystemOut")
7372
@VisibleForTesting
7473
static Stream<SingleFileDiff> parseGitDiffOutput(String gitOutput) {
7574
return Streams.stream(Splitter.on(SEPARATOR).omitEmptyStrings().split(gitOutput))
@@ -97,7 +96,6 @@ static Stream<SingleFileDiff> parseGitDiffOutput(String gitOutput) {
9796
});
9897
}
9998

100-
@SuppressWarnings("for-rollout:SystemOut")
10199
private static void format(FormatterService formatter, SingleFileDiff diff) {
102100
String input;
103101
try {

gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/JavaFormatExtension.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ private FormatterService serviceLoadInternal() {
5151
})
5252
.toArray(URL[]::new);
5353

54-
@SuppressWarnings("for-rollout:BanClassLoader")
5554
ClassLoader classLoader = new URLClassLoader(jarUris, FormatterService.class.getClassLoader());
5655
return Iterables.getOnlyElement(ServiceLoader.load(FormatterService.class, classLoader));
5756
}

gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/SpotlessInterop.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
* {@link com.palantir.javaformat.gradle.PalantirJavaFormatSpotlessPlugin} even if spotless is not on the classpath.
3030
*/
3131
final class SpotlessInterop {
32-
@SuppressWarnings("for-rollout:NonFinalStaticField")
3332
private static Logger logger = Logging.getLogger(SpotlessInterop.class);
3433

3534
private SpotlessInterop() {}

gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/spotless/NativePalantirJavaFormatStep.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.gradle.api.logging.Logging;
3131

3232
public final class NativePalantirJavaFormatStep {
33-
@SuppressWarnings("for-rollout:NonFinalStaticField")
3433
private static Logger logger = Logging.getLogger(NativePalantirJavaFormatStep.class);
3534

3635
private NativePalantirJavaFormatStep() {}

idea-plugin/src/main/java/com/palantir/javaformat/intellij/FormatterProvider.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ private static Optional<FormatterService> createFormatter(FormatterCacheKey cach
100100
// Use "in-process" formatter service
101101
log.info("Using in-process formatter for jdk version {}", jdkMajorVersion);
102102
URL[] implementationUrls = toUrlsUnchecked(implementationClasspath);
103-
@SuppressWarnings("for-rollout:BanClassLoader")
104103
ClassLoader classLoader = new URLClassLoader(implementationUrls, FormatterService.class.getClassLoader());
105104
return ServiceLoader.load(FormatterService.class, classLoader).findFirst();
106105
}

palantir-java-format-jdk-bootstrap/src/main/java/com/palantir/javaformat/bootstrap/BootstrappingFormatterService.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ public String formatSourceReflowStringsAndFixImports(String input) {
6868
}
6969
}
7070

71-
@SuppressWarnings("for-rollout:CheckedExceptionNotThrown")
7271
@Override
7372
public String fixImports(String input) throws FormatterException {
7473
try {

0 commit comments

Comments
 (0)