From 0c36bbdd00af29a0a61dbbf95677304ee1e808fd Mon Sep 17 00:00:00 2001
From: Dustin Spicuzza <dustin@virtualroadside.com>
Date: Wed, 1 Nov 2023 01:17:07 -0400
Subject: [PATCH] Updates for 2024 beta

---
 .github/workflows/dist.yml    |  7 +++----
 gen/CANSparkMax.yml           |  8 ++++++--
 gen/ColorMatch.yml            |  4 ++--
 gen/SparkMaxPIDController.yml |  8 ++------
 pyproject.toml                | 18 +++++++++---------
 5 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
index 4bbb22e..40dd826 100644
--- a/.github/workflows/dist.yml
+++ b/.github/workflows/dist.yml
@@ -11,12 +11,11 @@ on:
 
 jobs:
   ci:
-    uses: robotpy/build-actions/.github/workflows/package-ci.yml@v2023
+    uses: robotpy/build-actions/.github/workflows/package-ci.yml@v2024
     secrets:
-      SSH_USER: ${{ secrets.SSH_USER }}
-      SSH_KEY: ${{ secrets.SSH_KEY }}
-      SSH_PASSPHRASE: ${{ secrets.SSH_PASSPHRASE }}
       META_REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
       RTD_TOKEN: ${{ secrets.RTD_TOKEN }}
       RTD_WEBHOOK: ${{ secrets.RTD_WEBHOOK }}
+      WPI_ARTIFACTORY_USERNAME: ${{ secrets.WPI_ARTIFACTORY_USERNAME }}
+      WPI_ARTIFACTORY_TOKEN: ${{ secrets.WPI_ARTIFACTORY_TOKEN }}
       PYPI_API_TOKEN: ${{ secrets.PYPI_PASSWORD }}
diff --git a/gen/CANSparkMax.yml b/gen/CANSparkMax.yml
index 3727799..4490e0d 100644
--- a/gen/CANSparkMax.yml
+++ b/gen/CANSparkMax.yml
@@ -10,6 +10,10 @@ classes:
         ignore: true
       SoftLimitDirection:
       FaultID:
+    attributes:
+      kFollowerDisabled:
+      kFollowerSparkMax:
+      kFollowerPhoenix:
     methods:
       CANSparkMax:
       Set:
@@ -79,8 +83,8 @@ classes:
       GetClosedLoopRampRate:
       Follow:
         overloads:
-          rev::CANSparkMax&, bool:
-          CANSparkMax::ExternalFollower, int, bool:
+          const CANSparkMax&, bool:
+          ExternalFollower, int, bool:
       IsFollower:
       GetFaults:
       GetStickyFaults:
diff --git a/gen/ColorMatch.yml b/gen/ColorMatch.yml
index 56ef313..196da53 100644
--- a/gen/ColorMatch.yml
+++ b/gen/ColorMatch.yml
@@ -8,6 +8,6 @@ classes:
       SetConfidenceThreshold:
       MatchColor:
         overloads:
-          frc::Color&:
-          frc::Color&, double&:
+          const frc::Color&:
+          const frc::Color&, double&:
       MatchClosestColor:
diff --git a/gen/SparkMaxPIDController.yml b/gen/SparkMaxPIDController.yml
index fb05eda..c93794a 100644
--- a/gen/SparkMaxPIDController.yml
+++ b/gen/SparkMaxPIDController.yml
@@ -5,17 +5,13 @@ extra_includes:
 
 classes:
   SparkMaxPIDController:
-    ignored_bases:
-    - CANPIDController
-    typealias:
-    - rev::SparkMaxPIDController::ArbFFUnits
     enums:
       AccelStrategy:
       ArbFFUnits:
     methods:
       SetReference:
         overloads:
-          double, CANSparkMaxLowLevel::ControlType, int, double, rev::SparkMaxPIDController::ArbFFUnits:
+          double, CANSparkMaxLowLevel::ControlType, int, double, SparkMaxPIDController::ArbFFUnits:
           double, ControlType, int, double, CANPIDController::ArbFFUnits:
             ignore: true
       SetP:
@@ -55,7 +51,7 @@ classes:
       SetSmartMotionAllowedClosedLoopError:
       SetSmartMotionAccelStrategy:
         overloads:
-          rev::SparkMaxPIDController::AccelStrategy, int:
+          SparkMaxPIDController::AccelStrategy, int:
           CANPIDController::AccelStrategy, int:
             ignore: true
       GetSmartMotionMaxVelocity:
diff --git a/pyproject.toml b/pyproject.toml
index f22df76..3e222b0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,17 +6,17 @@ author_email = "robotpy@googlegroups.com"
 url = "https://github.com/robotpy/robotpy-rev"
 license = "BSD-3-Clause"
 install_requires = [
-    "robotpy-wpiutil<2024.0.0,>=2023.1.1.0",
-    "robotpy-wpimath<2024.0.0,>=2023.1.1.0",
-    "wpilib<2024.0.0,>=2023.1.1.0",
+    "robotpy-wpiutil<2025.0.0,>=2023.1.1.0",
+    "robotpy-wpimath<2025.0.0,>=2023.1.1.0",
+    "wpilib<2025.0.0,>=2023.1.1.0",
 ]
 
 [build-system]
 requires = [
-    "robotpy-build<2024.0.0,>=2023.0.0",
-    "robotpy-wpiutil<2024.0.0,>=2023.1.1.0",
-    "robotpy-wpimath<2024.0.0,>=2023.1.1.0",
-    "wpilib<2024.0.0,>=2023.1.1.0",
+    "robotpy-build<2025.0.0,~=2024.0.0b2",
+    "robotpy-wpiutil<2025.0.0,>=2023.1.1.0",
+    "robotpy-wpimath<2025.0.0,>=2023.1.1.0",
+    "wpilib<2025.0.0,>=2023.1.1.0",
 ]
 
 [tool.robotpy-build]
@@ -26,14 +26,14 @@ base_package = "rev"
 artifact_id = "REVLib-driver"
 group_id = "com.revrobotics.frc"
 repo_url = "https://maven.revrobotics.com"
-version = "2023.1.3"
+version = "2024.0.0"
 libs = ["REVLibDriver"]
 
 [tool.robotpy-build.static_libs."revlib".maven_lib_download]
 artifact_id = "REVLib-cpp"
 group_id = "com.revrobotics.frc"
 repo_url = "https://maven.revrobotics.com"
-version = "2023.1.3"
+version = "2024.0.0"
 libs = ["REVLib"]
 
 [tool.robotpy-build.wrappers."rev"]