Skip to content

Commit 0984f78

Browse files
Excavator: Upgrades Baseline to the latest version (#1369)
1 parent d39fa61 commit 0984f78

File tree

20 files changed

+28
-5
lines changed

20 files changed

+28
-5
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.42.0'
10+
classpath 'com.palantir.baseline:gradle-baseline-java:6.43.0'
1111
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.36.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'

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public abstract class ExecutableTransform implements TransformAction<TransformPa
4646
@InputArtifact
4747
public abstract Provider<FileSystemLocation> getInputArtifact();
4848

49+
@SuppressWarnings("for-rollout:PreferUncheckedIoException")
4950
@Override
5051
public void transform(TransformOutputs outputs) {
5152
File inputFile = getInputArtifact().get().getAsFile();
@@ -58,6 +59,7 @@ public void transform(TransformOutputs outputs) {
5859
}
5960
}
6061

62+
@SuppressWarnings("for-rollout:PreferUncheckedIoException")
6163
private static void makeFileExecutable(Path pathToExe) {
6264
try {
6365
Set<PosixFilePermission> existingPermissions = Files.getPosixFilePermissions(pathToExe);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public FormatterService serviceLoad() {
4141

4242
@SuppressWarnings("for-rollout:NullAway")
4343
private FormatterService serviceLoadInternal() {
44+
@SuppressWarnings("for-rollout:PreferUncheckedIoException")
4445
URL[] jarUris = configuration.getFiles().stream()
4546
.map(file -> {
4647
try {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ static final class State implements Serializable {
7979
this.memoizedFormatter = memoizedFormatter;
8080
}
8181

82-
@SuppressWarnings("NullableProblems")
82+
@SuppressWarnings({"NullableProblems", "for-rollout:PreferUncheckedIoException"})
8383
FormatterFunc createFormat() {
8484
return input -> {
8585
try {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ private static URL[] toUrlsUnchecked(List<Path> paths) {
207207
.toArray(URL[]::new);
208208
}
209209

210+
@SuppressWarnings("for-rollout:PreferUncheckedIoException")
210211
private static List<Path> listDirAsUrlsUnchecked(Path dir) {
211212
try (Stream<Path> list = Files.list(dir)) {
212213
return list.collect(Collectors.toList());

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ Optional<String> getImplementationVersion() {
113113
return Optional.ofNullable(FormatterProvider.getPluginDescriptor().getVersion());
114114
}
115115

116+
@SuppressWarnings("for-rollout:PreferUncheckedIoException")
116117
Optional<String> computeFormatterVersion() {
117118
return getImplementationClassPath().map(classpath -> classpath.stream()
118119
.flatMap(uri -> {

idea-plugin/src/test/java/com/palantir/javaformat/intellij/PalantirJavaFormatFormattingServiceTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ protected Project getProject() {
103103
@NotNull
104104
protected LightProjectDescriptor getProjectDescriptor() {
105105
return new DefaultLightProjectDescriptor() {
106+
@SuppressWarnings("for-rollout:PreferUncheckedIoException")
106107
@Override
107108
public Sdk getSdk() {
108109
try {

palantir-java-format-benchmarks/src/jmh/java/com/palantir/javaformat/BenchmarkMultiFiles.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public static class BenchmarkState {
4747

4848
final List<String> filesToFormat = getFilesToFormat();
4949

50+
@SuppressWarnings("for-rollout:PreferUncheckedIoException")
5051
private static List<String> getFilesToFormat() {
5152
Path srcJavaFormatFiles = Paths.get(".")
5253
.toAbsolutePath()

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public BootstrappingFormatterService(Path jdkPath, Integer jdkMajorVersion, List
5050
this.implementationClassPath = implementationClassPath;
5151
}
5252

53+
@SuppressWarnings("for-rollout:PreferUncheckedIoException")
5354
@Override
5455
public ImmutableList<Replacement> getFormatReplacements(String input, Collection<Range<Integer>> ranges) {
5556
try {
@@ -59,6 +60,7 @@ public ImmutableList<Replacement> getFormatReplacements(String input, Collection
5960
}
6061
}
6162

63+
@SuppressWarnings("for-rollout:PreferUncheckedIoException")
6264
@Override
6365
public String formatSourceReflowStringsAndFixImports(String input) {
6466
try {
@@ -68,6 +70,7 @@ public String formatSourceReflowStringsAndFixImports(String input) {
6870
}
6971
}
7072

73+
@SuppressWarnings("for-rollout:PreferUncheckedIoException")
7174
@Override
7275
public String fixImports(String input) throws FormatterException {
7376
try {

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public NativeImageFormatterService(Path nativeImagePath) {
4242
this.nativeImagePath = nativeImagePath;
4343
}
4444

45+
@SuppressWarnings("for-rollout:PreferUncheckedIoException")
4546
@Override
4647
public ImmutableList<Replacement> getFormatReplacements(String input, Collection<Range<Integer>> ranges) {
4748
try {
@@ -63,6 +64,7 @@ public ImmutableList<Replacement> getFormatReplacements(String input, Collection
6364
}
6465
}
6566

67+
@SuppressWarnings("for-rollout:PreferUncheckedIoException")
6668
@Override
6769
public String formatSourceReflowStringsAndFixImports(String input) {
6870
try {
@@ -72,6 +74,7 @@ public String formatSourceReflowStringsAndFixImports(String input) {
7274
}
7375
}
7476

77+
@SuppressWarnings("for-rollout:PreferUncheckedIoException")
7578
@Override
7679
public String fixImports(String input) {
7780
try {

0 commit comments

Comments
 (0)