From 1921d019b70b101eb6cd7c93c5ccd62d6c77a261 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Fri, 6 Dec 2024 22:19:00 -0800
Subject: [PATCH] [build] Update arm builds to bookworm (#7501)

Also bumps native-utils to 2025.9.0.
And upgrades OpenCV to -3; fixes some enum conversion deprecation warnings.
---
 .github/workflows/gradle.yml         | 4 ++--
 .github/workflows/sentinel-build.yml | 4 ++--
 buildSrc/build.gradle                | 2 +-
 shared/config.gradle                 | 2 +-
 shared/opencv.gradle                 | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index e6935cfba9..5ee9430ac0 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -15,10 +15,10 @@ jobs:
           - container: wpilib/roborio-cross-ubuntu:2025-22.04
             artifact-name: Athena
             build-options: "-Ponlylinuxathena"
-          - container: wpilib/raspbian-cross-ubuntu:bullseye-22.04
+          - container: wpilib/raspbian-cross-ubuntu:bookworm-22.04
             artifact-name: Arm32
             build-options: "-Ponlylinuxarm32"
-          - container: wpilib/aarch64-cross-ubuntu:bullseye-22.04
+          - container: wpilib/aarch64-cross-ubuntu:bookworm-22.04
             artifact-name: Arm64
             build-options: "-Ponlylinuxarm64"
           - container: wpilib/ubuntu-base:22.04
diff --git a/.github/workflows/sentinel-build.yml b/.github/workflows/sentinel-build.yml
index 9a8eb85184..18adcf7675 100644
--- a/.github/workflows/sentinel-build.yml
+++ b/.github/workflows/sentinel-build.yml
@@ -19,10 +19,10 @@ jobs:
           - container: wpilib/roborio-cross-ubuntu:2025-22.04
             artifact-name: Athena
             build-options: "-Ponlylinuxathena"
-          - container: wpilib/raspbian-cross-ubuntu:bullseye-22.04
+          - container: wpilib/raspbian-cross-ubuntu:bookworm-22.04
             artifact-name: Arm32
             build-options: "-Ponlylinuxarm32"
-          - container: wpilib/aarch64-cross-ubuntu:bullseye-22.04
+          - container: wpilib/aarch64-cross-ubuntu:bookworm-22.04
             artifact-name: Arm64
             build-options: "-Ponlylinuxarm64"
           - container: wpilib/ubuntu-base:22.04
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 5c555c1c53..8a0ad0c1a9 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -9,5 +9,5 @@ repositories {
     }
 }
 dependencies {
-    implementation "edu.wpi.first:native-utils:2025.7.1"
+    implementation "edu.wpi.first:native-utils:2025.9.0"
 }
diff --git a/shared/config.gradle b/shared/config.gradle
index e15a80c35a..7eebdb0a77 100644
--- a/shared/config.gradle
+++ b/shared/config.gradle
@@ -15,7 +15,7 @@ nativeUtils {
         configureDependencies {
             opencvYear = "frc2025"
             niLibVersion = "2025.0.0"
-            opencvVersion = "4.10.0-2"
+            opencvVersion = "4.10.0-3"
         }
     }
 }
diff --git a/shared/opencv.gradle b/shared/opencv.gradle
index 56c84bf48d..32b4598932 100644
--- a/shared/opencv.gradle
+++ b/shared/opencv.gradle
@@ -1,4 +1,4 @@
-def opencvVersion = '4.10.0-2'
+def opencvVersion = '4.10.0-3'
 
 if (project.hasProperty('useCpp') && project.useCpp) {
     model {