Update for 2025.1.1-beta-3 (#768)

Bump opencv to 2025.
wpilibsuite · Dec 16, 2024 · 4077043 · 4077043
1 parent 2a5a5e7
commit 4077043
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 21 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version = 2025.1.1-beta-2
+version = 2025.1.1-beta-3
diff --git a/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java b/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java
@@ -6,24 +6,24 @@
 
 public abstract class WPIVersionsExtension {
 
-    private static final String wpilibVersion = "2025.1.1-beta-2";
+    private static final String wpilibVersion = "2025.1.1-beta-3";
     private static final String niLibrariesVersion = "2025.0.0";
-    private static final String opencvVersion = "4.8.0-4";
+    private static final String opencvVersion = "4.10.0-3";
     private static final String imguiVersion = "1.89.9-1";
     private static final String ejmlVersion = "0.43.1";
     private static final String jacksonVersion = "2.15.2";
     private static final String quickbufVersion = "1.3.3";
-    private static final String wpimathVersion = "2025.1.1-beta-2";
+    private static final String wpimathVersion = "2025.1.1-beta-3";
 
-    private static final String smartDashboardVersion = "2025.1.1-beta-2";
-    private static final String shuffleboardVersion = "2025.1.1-beta-2";
-    private static final String outlineViewerVersion = "2025.1.1-beta-2";
-    private static final String robotBuilderVersion = "2025.1.1-beta-2";
-    private static final String pathWeaverVersion = "2025.1.1-beta-2";
-    private static final String glassVersion = "2025.1.1-beta-2";
-    private static final String sysIdVersion = "2025.1.1-beta-2";
-    private static final String roboRIOTeamNumberSetterVersion = "2025.1.1-beta-2";
-    private static final String dataLogToolVersion = "2025.1.1-beta-2";
+    private static final String smartDashboardVersion = "2025.1.1-beta-3";
+    private static final String shuffleboardVersion = "2025.1.1-beta-3";
+    private static final String outlineViewerVersion = "2025.1.1-beta-3";
+    private static final String robotBuilderVersion = "2025.1.1-beta-3";
+    private static final String pathWeaverVersion = "2025.1.1-beta-3";
+    private static final String glassVersion = "2025.1.1-beta-3";
+    private static final String sysIdVersion = "2025.1.1-beta-3";
+    private static final String roboRIOTeamNumberSetterVersion = "2025.1.1-beta-3";
+    private static final String dataLogToolVersion = "2025.1.1-beta-3";
 
 
     public abstract Property<String> getWpilibVersion();

diff --git a/src/main/java/edu/wpi/first/gradlerio/wpi/cpp/WPINativeExtension.java b/src/main/java/edu/wpi/first/gradlerio/wpi/cpp/WPINativeExtension.java
@@ -118,7 +118,7 @@ public WPINativeExtension(Project project, WPIExtension wpi, WPIVersionsExtensio
         // nte.setSinglePrintPerPlatform();
 
         nte.getWpi().configureDependencies(wpiDeps -> {
-            wpiDeps.getOpencvYear().set("frc2024");
+            wpiDeps.getOpencvYear().set("frc2025");
             wpiDeps.getWpiVersion().set(versions.getWpilibVersion());
             wpiDeps.getNiLibVersion().set(versions.getNiLibrariesVersion());
             wpiDeps.getOpencvVersion().set(versions.getOpencvVersion());

diff --git a/src/main/java/edu/wpi/first/gradlerio/wpi/java/WPIJavaDepsExtension.java b/src/main/java/edu/wpi/first/gradlerio/wpi/java/WPIJavaDepsExtension.java
@@ -56,7 +56,7 @@ public WPIJavaDepsExtension(WPIVersionsExtension versions, ProviderFactory provi
         createJavaDependencies("edu.wpi.first.wpiunits", "wpiunits-java", versions.getWpilibVersion());
         createJavaDependencies("edu.wpi.first.epilogue", "epilogue-runtime-java", versions.getWpilibVersion());
 
-        createJavaDependencies("edu.wpi.first.thirdparty.frc2024.opencv", "opencv-java", versions.getOpencvVersion());
+        createJavaDependencies("edu.wpi.first.thirdparty.frc2025.opencv", "opencv-java", versions.getOpencvVersion());
         createJavaDependencies("org.ejml", "ejml-simple", versions.getEjmlVersion());
 
         createJavaDependencies("com.fasterxml.jackson.core", "jackson-annotations", versions.getJacksonVersion());
@@ -98,7 +98,7 @@ private List<Provider<String>> getWpilibJniInternal(boolean debug, String platfo
             createJniDependency("edu.wpi.first.wpimath", "wpimath-cpp", versions.getWpimathVersion(), debug, platform),
             createJniDependency("edu.wpi.first.ntcore", "ntcore-cpp", versions.getWpilibVersion(), debug, platform),
             createJniDependency("edu.wpi.first.cscore", "cscore-cpp", versions.getWpilibVersion(), debug, platform),
-            createJniDependency("edu.wpi.first.thirdparty.frc2024.opencv", "opencv-cpp", versions.getOpencvVersion(), debug, platform),
+            createJniDependency("edu.wpi.first.thirdparty.frc2025.opencv", "opencv-cpp", versions.getOpencvVersion(), debug, platform),
             createJniDependency("edu.wpi.first.wpinet", "wpinet-cpp", versions.getWpilibVersion(), debug, platform),
             createJniDependency("edu.wpi.first.wpiutil", "wpiutil-cpp", versions.getWpilibVersion(), debug, platform),
             createJniDependency("edu.wpi.first.apriltag", "apriltag-cpp", versions.getWpilibVersion(), debug, platform)

diff --git a/testing/asm/build.gradle b/testing/asm/build.gradle
@@ -1,7 +1,7 @@
 
 plugins {
     id "assembler"
-    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
+    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
 }
 
 def projectFolder = project.buildFile.parentFile

diff --git a/testing/cpp/build.gradle b/testing/cpp/build.gradle
@@ -2,7 +2,7 @@
 plugins {
     id "cpp"
     id "google-test-test-suite"
-    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
+    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
 }
 
 def projectFolder = project.buildFile.parentFile

diff --git a/testing/java/build.gradle b/testing/java/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "java"
-    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
+    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
 }
 
 def projectFolder = project.buildFile.parentFile

diff --git a/testing/jni/build.gradle b/testing/jni/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "java"
     id "cpp"
-    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
+    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
     id 'edu.wpi.first.GradleJni' version '0.10.1'
 }
 

diff --git a/versionupdates.gradle b/versionupdates.gradle
@@ -10,7 +10,7 @@ def versionMap = [
   sysIdVersion: 'edu.wpi.first.tools:SysId:+:windowsx86-64@zip',
   roboRIOTeamNumberSetterVersion: 'edu.wpi.first.tools:roboRIOTeamNumberSetter:+:windowsx86-64@zip',
   dataLogToolVersion: 'edu.wpi.first.tools:DataLogTool:+:windowsx86-64@zip',
-  opencvVersion: 'edu.wpi.first.thirdparty.frc2024.opencv:opencv-java:+',
+  opencvVersion: 'edu.wpi.first.thirdparty.frc2025.opencv:opencv-java:+',
   niLibrariesVersion: 'edu.wpi.first.ni-libraries:runtime:+:allowedimages@zip',
   imguiVersion: 'edu.wpi.first.thirdparty.frc2024:imgui:+:headers',
   wpimathVersion: 'edu.wpi.first.wpimath:wpimath-java:+'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		version = 2025.1.1-beta-2
		version = 2025.1.1-beta-3