diff --git a/wpilibNewCommands/BUILD.bazel b/wpilibNewCommands/BUILD.bazel index 5113f99112..0378855d48 100644 --- a/wpilibNewCommands/BUILD.bazel +++ b/wpilibNewCommands/BUILD.bazel @@ -104,9 +104,9 @@ wpilib_cc_static_library( wpilib_java_library( name = "wpilibNewCommands-java", srcs = glob(["src/main/java/**/*.java"]) + [":generated_java"], + exported_plugins = ["//javacPlugin:plugin"], maven_artifact_name = "wpilibNewCommands-java", maven_group_id = "edu.wpi.first.wpilibNewCommands", - exported_plugins = ["//javacPlugin:plugin"], plugins = ["//javacPlugin:plugin"], visibility = ["//visibility:public"], deps = [ @@ -148,6 +148,7 @@ wpilib_java_junit5_test( ":wpilibNewCommands-java", "//hal:hal-java", "//ntcore:ntcore-java", + "//wpiannotations", "//wpilibj:wpilibj-java", "//wpimath:wpimath-java", "//wpiunits:wpiunits-java", diff --git a/wpilibNewCommands/build.gradle b/wpilibNewCommands/build.gradle index ac8085db5b..a8b83b34cf 100644 --- a/wpilibNewCommands/build.gradle +++ b/wpilibNewCommands/build.gradle @@ -25,6 +25,7 @@ dependencies { api project(':datalog') testImplementation 'org.mockito:mockito-core:4.1.0' annotationProcessor project(':javacPlugin') + testAnnotationProcessor project(':javacPlugin') } sourceSets.main.java.srcDir "${projectDir}/src/generated/main/java" diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/SingleCompositionTestBase.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/SingleCompositionTestBase.java index 5f6fe9e861..0474271818 100644 --- a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/SingleCompositionTestBase.java +++ b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/SingleCompositionTestBase.java @@ -30,6 +30,7 @@ public abstract class SingleCompositionTestBase extends Comma } @Test + @SuppressWarnings("NoDiscard") void commandInOtherCompositionTest() { var command = Commands.none(); new WrapperCommand(command) {};