Skip to content

Commit 137ae7b

Browse files
Excavator: Upgrades Baseline to the latest version (#1261)
1 parent 2860ca9 commit 137ae7b

File tree

2 files changed

+5
-1
lines changed

2 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:1.3.1'
10-
classpath 'com.palantir.baseline:gradle-baseline-java:6.23.0'
10+
classpath 'com.palantir.baseline:gradle-baseline-java:6.24.0'
1111
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.32.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.13.0'

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ Optional<FormatterService> get(Project project, PalantirJavaFormatSettings setti
7474
settings.injectedVersionIsOutdated()));
7575
}
7676

77+
@SuppressWarnings("for-rollout:Slf4jLogsafeArgs")
7778
private static Optional<FormatterService> createFormatter(FormatterCacheKey cacheKey) {
7879
if (cacheKey.nativeImageClassPath.isPresent()) {
7980
log.info("Using the native formatter with classpath: {}", cacheKey.nativeImageClassPath.get());
@@ -118,6 +119,7 @@ private static List<Path> getProvidedImplementationUrls(List<URI> implementation
118119
return implementationClasspath.stream().map(Path::of).collect(Collectors.toList());
119120
}
120121

122+
@SuppressWarnings("for-rollout:Slf4jLogsafeArgs")
121123
private static List<Path> getBundledImplementationUrls() {
122124
// Load from the jars bundled with the plugin.
123125
IdeaPluginDescriptor ourPlugin = getPluginDescriptor();
@@ -126,6 +128,7 @@ private static List<Path> getBundledImplementationUrls() {
126128
return listDirAsUrlsUnchecked(implDir);
127129
}
128130

131+
@SuppressWarnings("for-rollout:Slf4jLogsafeArgs")
129132
private static List<Path> getImplementationUrls(
130133
Optional<List<URI>> implementationClassPath, boolean useBundledImplementation) {
131134
if (useBundledImplementation) {
@@ -173,6 +176,7 @@ private static OptionalInt parseSdkJavaVersion(Sdk sdk) {
173176
return parseSdkJavaVersion(version);
174177
}
175178

179+
@SuppressWarnings("for-rollout:Slf4jLogsafeArgs")
176180
@VisibleForTesting
177181
static OptionalInt parseSdkJavaVersion(String version) {
178182
int indexOfVersionDelimiter = version.indexOf('.');

0 commit comments

Comments
 (0)