diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/CommandBase.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/CommandBase.java deleted file mode 100644 index d75f08a29e..0000000000 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/CommandBase.java +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) FIRST and other WPILib contributors. -// Open Source Software; you can modify and/or share it under the terms of -// the WPILib BSD license file in the root directory of this project. - -package edu.wpi.first.wpilibj2.command; - -import edu.wpi.first.util.sendable.Sendable; - -/** - * A {@link Sendable} base class for {@link Command}s. - * - *
This class is provided by the NewCommands VendorDep
- *
- * @deprecated All functionality provided by {@link CommandBase} has been merged into {@link
- * Command}. Use {@link Command} instead.
- */
-@Deprecated(since = "2024", forRemoval = true)
-@SuppressWarnings("PMD.AbstractClassWithoutAnyMethod")
-public abstract class CommandBase extends Command {
- /** Default constructor. */
- public CommandBase() {
- super();
- }
-}
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/CommandBase.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/CommandBase.cpp
deleted file mode 100644
index 7e2fad1a9f..0000000000
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/CommandBase.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright (c) FIRST and other WPILib contributors.
-// Open Source Software; you can modify and/or share it under the terms of
-// the WPILib BSD license file in the root directory of this project.
-
-#include "frc2/command/CommandBase.h"
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/CommandBase.h b/wpilibNewCommands/src/main/native/include/frc2/command/CommandBase.h
deleted file mode 100644
index d1067698db..0000000000
--- a/wpilibNewCommands/src/main/native/include/frc2/command/CommandBase.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) FIRST and other WPILib contributors.
-// Open Source Software; you can modify and/or share it under the terms of
-// the WPILib BSD license file in the root directory of this project.
-
-#pragma once
-
-#include "frc2/command/Command.h"
-
-namespace frc2 {
-/**
- * A Sendable base class for Commands.
- *
- * This class is provided by the NewCommands VendorDep
- *
- * @deprecated All functionality provided by CommandBase has been merged into
- * Command. Use Command instead.
- */
-class [[deprecated("Use Command instead")]] CommandBase : public Command {
- protected:
- [[deprecated("Use Command instead")]]
- CommandBase();
-};
-} // namespace frc2
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/ParallelDeadlineGroup.h b/wpilibNewCommands/src/main/native/include/frc2/command/ParallelDeadlineGroup.h
index 22e9759f2b..4cbf878d11 100644
--- a/wpilibNewCommands/src/main/native/include/frc2/command/ParallelDeadlineGroup.h
+++ b/wpilibNewCommands/src/main/native/include/frc2/command/ParallelDeadlineGroup.h
@@ -16,7 +16,6 @@
#include