Skip to content

Commit 95db3d4

Browse files
Excavator: Upgrades Baseline to the latest version
1 parent d36ea20 commit 95db3d4

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
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:2.0.0'
10-
classpath 'com.palantir.baseline:gradle-baseline-java:6.54.0'
10+
classpath 'com.palantir.baseline:gradle-baseline-java:6.55.0'
1111
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:3.2.0'
1212
classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.24.0'
1313
classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.15.0'

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ final class FormatterProvider {
6161
private final LoadingCache<FormatterCacheKey, Optional<FormatterService>> implementationCache =
6262
Caffeine.newBuilder().maximumSize(1).build(FormatterProvider::createFormatter);
6363

64+
@SuppressWarnings("for-rollout:deprecation")
6465
static IdeaPluginDescriptor getPluginDescriptor() {
6566
return Preconditions.checkNotNull(
6667
PluginManager.getPlugin(PluginId.getId(PLUGIN_ID)), "Couldn't find our own plugin: %s", PLUGIN_ID);
@@ -124,6 +125,7 @@ private static List<Path> getProvidedImplementationUrls(List<URI> implementation
124125
private static List<Path> getBundledImplementationUrls() {
125126
// Load from the jars bundled with the plugin.
126127
IdeaPluginDescriptor ourPlugin = getPluginDescriptor();
128+
@SuppressWarnings("for-rollout:deprecation")
127129
Path implDir = ourPlugin.getPath().toPath().resolve("impl");
128130
log.debug("Using palantir-java-format implementation bundled with plugin: {}", implDir);
129131
return listDirAsUrlsUnchecked(implDir);
@@ -172,6 +174,7 @@ private static OptionalInt getSdkVersion(Project project) {
172174
private static OptionalInt parseSdkJavaVersion(Sdk sdk) {
173175
// Parses the actual version out of "SDK#getVersionString" which returns 'java version "15"'
174176
// or 'openjdk version "15.0.2"'.
177+
@SuppressWarnings("for-rollout:deprecation")
175178
String version = Preconditions.checkNotNull(
176179
JdkUtil.getJdkMainAttribute(sdk, Name.IMPLEMENTATION_VERSION), "JDK version is null");
177180
return parseSdkJavaVersion(version);

palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInputAstVisitor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1820,6 +1820,7 @@ boolean visitSingleMemberAnnotation(AnnotationTree node) {
18201820
return true;
18211821
}
18221822

1823+
@SuppressWarnings("for-rollout:deprecation")
18231824
@Override
18241825
public Void visitCase(CaseTree node, Void unused) {
18251826
sync(node);

0 commit comments

Comments
 (0)