Skip to content

Commit 659bec6

Browse files
Excavator: Enable or upgrade gradle-guide plugin
1 parent a58703a commit 659bec6

5 files changed

Lines changed: 6 additions & 12 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ buildscript {
1616
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:3.15.0'
1717
classpath 'com.palantir.baseline:gradle-baseline-java:6.72.0'
1818
classpath 'com.palantir.gradle.gitversion:gradle-git-version:5.0.0'
19-
classpath 'com.palantir.gradle.guide:gradle-guide:1.25.0'
19+
classpath 'com.palantir.gradle.guide:gradle-guide:1.27.0'
2020
classpath 'com.palantir.gradle.idea-configuration:gradle-idea-configuration:0.8.0'
2121
classpath 'com.palantir.gradle.idea-language-injector:gradle-idea-language-injector:0.2.0'
2222
classpath 'com.gradle.publish:plugin-publish-plugin:2.1.1'

discover-tests-cli/src/main/java/com/palantir/gradle/plugintesting/SubClassesOfCommand.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public FilterResult apply(TestDescriptor testDescriptor) {
6363
};
6464
}
6565

66-
@SuppressWarnings("for-rollout:StreamFlatMapOptional")
6766
static List<Class<?>> getClassesFrom(List<String> classNames) {
6867
return classNames.stream()
6968
.map(className -> {
@@ -72,9 +71,7 @@ static List<Class<?>> getClassesFrom(List<String> classNames) {
7271
} catch (ClassNotFoundException e) {
7372
return Optional.<Class<?>>empty();
7473
}
75-
})
76-
.filter(Optional::isPresent)
77-
.map(Optional::get)
74+
}).<? extends Class<?>>mapMulti(Optional::ifPresent)
7875
.collect(Collectors.toList());
7976
}
8077

discover-tests-cli/src/main/java/com/palantir/gradle/plugintesting/WithAnnotationsCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ private static boolean hasAnyClassAnnotations(
7171
return annotations.stream().anyMatch(annotation -> AnnotationSupport.isAnnotated(clazz, annotation));
7272
}
7373

74-
@SuppressWarnings({"BanSystemOut", "for-rollout:UnnecessarilyQualified"})
74+
@SuppressWarnings("BanSystemOut")
7575
private static Optional<Class<? extends Annotation>> getClassAnnotation(String annotationName) {
7676
try {
77-
return Optional.of((Class<? extends java.lang.annotation.Annotation>) Class.forName(annotationName));
77+
return Optional.of((Class<? extends Annotation>) Class.forName(annotationName));
7878
} catch (ClassNotFoundException e) {
7979
System.out.format(
8080
"Failed to retrieve the annotation class from the string name: %s, Skipping", annotationName);

gradle-plugin-testing/src/main/java/com/palantir/gradle/plugintesting/DiscoverTestClassesTask.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,10 @@ public abstract class DiscoverTestClassesTask extends JavaExec {
7272
@Inject
7373
public abstract ProjectLayout getProjectLayout();
7474

75-
@SuppressWarnings("for-rollout:MissingOverride")
76-
@Inject
75+
@Override @Inject
7776
public abstract ProviderFactory getProviderFactory();
7877

79-
@SuppressWarnings("for-rollout:MissingOverride")
80-
@Inject
78+
@Override @Inject
8179
public abstract ObjectFactory getObjectFactory();
8280

8381
public DiscoverTestClassesTask() {

gradle-plugin-testing/src/main/java/com/palantir/gradle/plugintesting/PluginTestingPlugin.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ public void apply(Project project) {
9191
});
9292
}
9393

94-
@SuppressWarnings("for-rollout:TaskDependsOn")
9594
private void doApply(Project project) {
9695
PluginTestingExtension testUtilsExt = project.getExtensions().getByType(PluginTestingExtension.class);
9796

0 commit comments

Comments
 (0)