From b89847fbfe6efc5d0b90411f3d4b3c29ccb1bd86 Mon Sep 17 00:00:00 2001
From: Jared Leonard <leonardj@playingwithfusion.com>
Date: Thu, 16 Jan 2025 09:40:28 -0600
Subject: [PATCH 1/2] Updated to 2025 PlayingWithFusion library

---
 .github/workflows/dist.yml |  2 +-
 .github/workflows/scan.yml |  2 +-
 pyproject.toml             | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
index af9774e..4448c57 100644
--- a/.github/workflows/dist.yml
+++ b/.github/workflows/dist.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   ci:
-    uses: robotpy/build-actions/.github/workflows/package-ci.yml@v2024
+    uses: robotpy/build-actions/.github/workflows/package-ci.yml@v2025
     with:
       enable_sphinx_check: false
       artifactory_repo_type: vendor
diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
index 657fecb..278b722 100644
--- a/.github/workflows/scan.yml
+++ b/.github/workflows/scan.yml
@@ -10,6 +10,6 @@ jobs:
     if: github.repository_owner	== 'robotpy'
     runs-on: ubuntu-latest
     steps:
-    - uses: robotpy/build-actions/check-for-maven-update@v2024
+    - uses: robotpy/build-actions/check-for-maven-update@v2025
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/pyproject.toml b/pyproject.toml
index 1f6aff4..c9354f7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,17 +6,17 @@ author_email = "robotpy@googlegroups.com"
 url = "https://github.com/robotpy/robotpy-playingwithfusion"
 license = "BSD-3-Clause"
 install_requires = [
-    "robotpy-wpiutil<2025.0.0,>=2024.3.2",
-    "robotpy-wpimath<2025.0.0,>=2024.3.2",
-    "wpilib<2025.0.0,>=2024.3.2",
+    "robotpy-wpiutil<2026.0.0,>=2025.0.0",
+    "robotpy-wpimath<2026.0.0,>=2025.0.0",
+    "wpilib<2026.0.0,>=2025.1.1",
 ]
 
 [build-system]
 requires = [
-    "robotpy-build<2025.0.0,>=2024.0.0",
-    "robotpy-wpiutil<2025.0.0,>=2024.3.2",
-    "robotpy-wpimath<2025.0.0,>=2024.3.2",
-    "wpilib<2025.0.0,>=2024.3.2",
+    "robotpy-build<2026.0.0,>=2025.0.0",
+    "robotpy-wpiutil<2026.0.0,>=2025.0.0",
+    "robotpy-wpimath<2026.0.0,>=2025.0.0",
+    "wpilib<2026.0.0,>=2025.1.1",
 ]
 
 [tool.robotpy-build]
@@ -26,7 +26,7 @@ base_package = "playingwithfusion"
 artifact_id = "PlayingWithFusion-driver"
 group_id = "com.playingwithfusion.frc"
 repo_url = "https://www.playingwithfusion.com/frc/maven"
-version = "2024.03.09"
+version = "2025.01.04"
 
 libs = ["PlayingWithFusionDriver"]
 
@@ -38,7 +38,7 @@ depends = ["wpilib_core", "wpiutil"]
 artifact_id = "PlayingWithFusion-cpp"
 group_id = "com.playingwithfusion.frc"
 repo_url = "https://www.playingwithfusion.com/frc/maven"
-version = "2024.03.09"
+version = "2025.01.04"
 
 libs = ["PlayingWithFusion"]
 

From 6ec93c1c2ee92bed93a2bde11a5449370723e5b1 Mon Sep 17 00:00:00 2001
From: Spicuzza <dustin@virtualroadside.com>
Date: Fri, 17 Jan 2025 11:10:00 -0500
Subject: [PATCH 2/2] Add direct HAL dependency

---
 pyproject.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index c9354f7..aa31327 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,7 +32,7 @@ libs = ["PlayingWithFusionDriver"]
 
 [tool.robotpy-build.wrappers."playingwithfusion._pwf_driver"]
 name = "playingwithfusion_driver"
-depends = ["wpilib_core", "wpiutil"]
+depends = ["wpilib_core", "wpiHal", "wpiutil"]
 
 [tool.robotpy-build.wrappers."playingwithfusion".maven_lib_download]
 artifact_id = "PlayingWithFusion-cpp"
@@ -48,7 +48,7 @@ sources = [
     "playingwithfusion/pwf.cpp"
 ]
 
-depends = ["wpilibc", "wpilib_core", "wpiutil", "playingwithfusion_driver"]
+depends = ["wpilibc", "wpilib_core", "wpiHal", "wpiutil", "playingwithfusion_driver"]
 
 generate = [
     { CANVenom = "CANVenom.h" },