Update to 2025 beta image (#23)

* Update to 2025 beta image * Fix CI
wpilibsuite · Oct 10, 2024 · 0e97e33 · 0e97e33
1 parent c48be89
commit 0e97e33
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
-    container: wpilib/roborio-cross-ubuntu:2023-22.04
+    container: wpilib/roborio-cross-ubuntu:2024-22.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -16,8 +16,8 @@ jobs:
 
       - uses: actions/setup-java@v4
         with:
-          java-version: 11
-          distribution: 'zulu'
+          distribution: 'temurin'
+          java-version: 17
 
       - name: Publish
         run: |

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id 'base'
     id 'maven-publish'
     id "com.jfrog.artifactory" version "4.29.3"
-    id 'edu.wpi.first.NativeUtils' version '2023.10.0'
+    id 'edu.wpi.first.NativeUtils' version '2025.3.0'
     id 'cpp'
     id 'c'
 }
@@ -85,8 +85,8 @@ class FileDependencySet implements NativeDependencySet {
 }
 
 def netCommDependencySet = new FileDependencySet(project.files(
-    'src/lib/netcomm/libFRC_NetworkCommunication.so.24.0.0',
-    'src/lib/chipobject/libRoboRIO_FRC_ChipObject.so.24.0.0',
+    'src/lib/netcomm/libFRC_NetworkCommunication.so.25.0.0',
+    'src/lib/chipobject/libRoboRIO_FRC_ChipObject.so.25.0.0',
     'src/lib/visa/libvisa.so.23.3.0'),
     project.files())
 
@@ -175,7 +175,7 @@ ext.addTaskToCopyAllOutputs = { task ->
     copyAllOutputs.from task.archivePath
 }
 
-def pubVersion = '2024.2.1'
+def pubVersion = '2025.0.0'
 
 def baseArtifactId = 'chipobject'
 def artifactGroupId = 'edu.wpi.first.ni-libraries'

diff --git a/src/include/FRC_NetworkCommunication/UsageReporting.h b/src/include/FRC_NetworkCommunication/UsageReporting.h
@@ -136,6 +136,8 @@ typedef enum
     kResourceType_Redux_future5,
     kResourceType_RevSparkFlexCAN,
     kResourceType_RevSparkFlexPWM,
+
+//    kResourceType_MaximumID = 255,
 } tResourceType;
 
 typedef enum

diff --git a/src/lib/chipobject/libRoboRIO_FRC_ChipObject.so.24.0.0 b/src/lib/chipobject/libRoboRIO_FRC_ChipObject.so.24.0.0
diff --git a/src/lib/chipobject/libRoboRIO_FRC_ChipObject.so.25.0.0 b/src/lib/chipobject/libRoboRIO_FRC_ChipObject.so.25.0.0
diff --git a/...omm/libFRC_NetworkCommunication.so.24.0.0 → ...omm/libFRC_NetworkCommunication.so.25.0.0 b/...omm/libFRC_NetworkCommunication.so.24.0.0 → ...omm/libFRC_NetworkCommunication.so.25.0.0