From a789632052ecd942b720d1e60444c669acac3f9f Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Sun, 8 Oct 2023 20:16:08 -0700
Subject: [PATCH] [build] Update to native utils 2024.3.1 (#5738)

Also switch to 2024 docker images.
---
 .github/workflows/cmake.yml      | 2 +-
 .github/workflows/gradle.yml     | 2 +-
 .github/workflows/sanitizers.yml | 2 +-
 buildSrc/build.gradle            | 2 +-
 shared/config.gradle             | 7 -------
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 93809039c4..459b237923 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -14,7 +14,7 @@ jobs:
         include:
           - os: ubuntu-22.04
             name: Linux
-            container: wpilib/roborio-cross-ubuntu:2023-22.04
+            container: wpilib/roborio-cross-ubuntu:2024-22.04
             flags: "-DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON"
           - os: macOS-12
             name: macOS
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 817cf36d20..d760a5f0b9 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - container: wpilib/roborio-cross-ubuntu:2023-22.04
+          - container: wpilib/roborio-cross-ubuntu:2024-22.04
             artifact-name: Athena
             build-options: "-Ponlylinuxathena"
           - container: wpilib/raspbian-cross-ubuntu:bullseye-22.04
diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml
index 9c5e46efe5..0db875d1a1 100644
--- a/.github/workflows/sanitizers.yml
+++ b/.github/workflows/sanitizers.yml
@@ -26,7 +26,7 @@ jobs:
             ctest-flags: ""
     name: "${{ matrix.name }}"
     runs-on: ubuntu-22.04
-    container: wpilib/roborio-cross-ubuntu:2023-22.04
+    container: wpilib/roborio-cross-ubuntu:2024-22.04
     steps:
       - name: Install Dependencies
         run: sudo apt-get update && sudo apt-get install -y libopencv-dev libopencv4.5-java python-is-python3 clang-14
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 7c3ffe1844..2c52479ef8 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -9,5 +9,5 @@ repositories {
     }
 }
 dependencies {
-    implementation "edu.wpi.first:native-utils:2024.2.0"
+    implementation "edu.wpi.first:native-utils:2024.3.1"
 }
diff --git a/shared/config.gradle b/shared/config.gradle
index 97e91a9239..d84bee59e2 100644
--- a/shared/config.gradle
+++ b/shared/config.gradle
@@ -55,13 +55,6 @@ nativeUtils.platformConfigs.each {
 // https://github.com/opencv/opencv/issues/20269
 nativeUtils.platformConfigs.osxuniversal.cppCompiler.args.add("-Wno-deprecated-anon-enum-enum-conversion")
 
-// NativeUtils uses the wrong compiler arguments for roboRIO targets, but it's
-// too late to fix NativeUtils for the 2023 season. This temporarily overwrites
-// the flags.
-nativeUtils.platformConfigs.named(nativeUtils.wpi.platforms.roborio).configure {
-    cppCompiler.args.remove('-Wno-error=deprecated-declarations')
-}
-
 nativeUtils.platformConfigs.linuxathena.linker.args.add("-Wl,--fatal-warnings")
 
 model {