Update to the latest WPILib version

Also updates OpenCV dependency since that has been updated to 2025.
roboblazers7617 · Jan 13, 2025 · 9b79059 · 9b79059
1 parent 9807c16
commit 9b79059
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/buttonbox-bridge-midi/build.gradle b/buttonbox-bridge-midi/build.gradle
@@ -2,7 +2,7 @@ plugins {
 	id "java"
 	id 'java-library'
 	id 'com.github.johnrengelman.shadow' version '8.1.1'
-	id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-1"
+	id "edu.wpi.first.GradleRIO" version "2025.2.1"
 	id 'edu.wpi.first.WpilibTools' version '1.3.0'
 }
 
@@ -21,7 +21,7 @@ nativeConfig.dependencies.add wpilibTools.deps.wpilib("wpinet")
 nativeConfig.dependencies.add wpilibTools.deps.wpilib("wpiutil")
 nativeConfig.dependencies.add wpilibTools.deps.wpilib("ntcore")
 nativeConfig.dependencies.add wpilibTools.deps.wpilib("cscore")
-nativeConfig.dependencies.add wpilibTools.deps.wpilibOpenCv("frc" + '2024', wpi.versions.opencvVersion.get())
+nativeConfig.dependencies.add wpilibTools.deps.wpilibOpenCv("frc" + '2025', wpi.versions.opencvVersion.get())
 
 dependencies {
 	implementation wpilibTools.deps.wpilibJava("wpilibNewCommands")
@@ -34,7 +34,7 @@ dependencies {
 	implementation wpilibTools.deps.wpilibJava("cameraserver")
 	implementation wpilibTools.deps.wpilibJava("hal")
 
-	implementation wpilibTools.deps.wpilibOpenCvJava("frc" + '2024', wpi.versions.opencvVersion.get())
+	implementation wpilibTools.deps.wpilibOpenCvJava("frc" + '2025', wpi.versions.opencvVersion.get())
 
 	implementation group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: wpi.versions.jacksonVersion.get()
 	implementation group: "com.fasterxml.jackson.core", name: "jackson-core", version: wpi.versions.jacksonVersion.get()

diff --git a/buttonbox-lib/build.gradle b/buttonbox-lib/build.gradle
@@ -2,7 +2,7 @@ plugins {
 	id "java"
 	id 'java-library'
 	id 'com.github.johnrengelman.shadow' version '8.1.1'
-	id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-1"
+	id "edu.wpi.first.GradleRIO" version "2025.2.1"
 	id 'edu.wpi.first.WpilibTools' version '1.3.0'
 }
 
@@ -21,8 +21,7 @@ nativeConfig.dependencies.add wpilibTools.deps.wpilib("wpinet")
 nativeConfig.dependencies.add wpilibTools.deps.wpilib("wpiutil")
 nativeConfig.dependencies.add wpilibTools.deps.wpilib("ntcore")
 nativeConfig.dependencies.add wpilibTools.deps.wpilib("cscore")
-// TODO: Make this 2025 (has to wait until dependency is updated)
-nativeConfig.dependencies.add wpilibTools.deps.wpilibOpenCv("frc" + '2024', wpi.versions.opencvVersion.get())
+nativeConfig.dependencies.add wpilibTools.deps.wpilibOpenCv("frc" + '2025', wpi.versions.opencvVersion.get())
 
 dependencies {
 	implementation wpilibTools.deps.wpilibJava("wpilibNewCommands")
@@ -35,7 +34,7 @@ dependencies {
 	implementation wpilibTools.deps.wpilibJava("cameraserver")
 	implementation wpilibTools.deps.wpilibJava("hal")
 
-	implementation wpilibTools.deps.wpilibOpenCvJava("frc" + '2024', wpi.versions.opencvVersion.get())
+	implementation wpilibTools.deps.wpilibOpenCvJava("frc" + '2025', wpi.versions.opencvVersion.get())
 
 	implementation group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: wpi.versions.jacksonVersion.get()
 	implementation group: "com.fasterxml.jackson.core", name: "jackson-core", version: wpi.versions.jacksonVersion.get()