Skip to content

Commit 7a0cb8c

Browse files
Excavator: Enable or upgrade gradle-guide plugin
1 parent 1517293 commit 7a0cb8c

6 files changed

Lines changed: 6 additions & 7 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.8.0'
1717
classpath 'com.palantir.baseline:gradle-baseline-java:6.72.0'
1818
classpath 'com.palantir.gradle.gitversion:gradle-git-version:4.2.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.0.0'

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@ static List<Class<?>> getClassesFrom(List<String> classNames) {
7171
} catch (ClassNotFoundException e) {
7272
return Optional.<Class<?>>empty();
7373
}
74-
})
75-
.filter(Optional::isPresent)
76-
.map(Optional::get)
74+
}).<? extends Class<?>>mapMulti(Optional::ifPresent)
7775
.collect(Collectors.toList());
7876
}
7977

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private static boolean hasAnyClassAnnotations(
7474
@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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,11 @@ public abstract class DiscoverTestClassesTask extends JavaExec {
7272
@Inject
7373
public abstract ProjectLayout getProjectLayout();
7474

75+
@Override
7576
@Inject
7677
public abstract ProviderFactory getProviderFactory();
7778

79+
@Override
7880
@Inject
7981
public abstract ObjectFactory getObjectFactory();
8082

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
@@ -90,7 +90,6 @@ public void apply(Project project) {
9090
});
9191
}
9292

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

gradle-test-versions-config/src/test/java/com/palantir/gradle/plugintesting/GradleTestVersionsConfigTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.junit.jupiter.api.Nested;
2626
import org.junit.jupiter.api.Test;
2727

28-
public class GradleTestVersionsConfigTest {
28+
public final class GradleTestVersionsConfigTest {
2929
private GradleTestVersionsConfigTest() {}
3030

3131
public static final ObjectMapper YAML_MAPPER = new ObjectMapper(new YAMLFactory());

0 commit comments

Comments
 (0)