From 5e6c34c61cfd2f4d577b20adea7b1910f397dd90 Mon Sep 17 00:00:00 2001
From: Thad House <ThadHouse@users.noreply.github.com>
Date: Fri, 10 Sep 2021 13:00:58 -0700
Subject: [PATCH] Update to 2022 roborio image (#3537)

---
 hal/src/main/native/athena/HAL.cpp | 6 ------
 shared/config.gradle               | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/hal/src/main/native/athena/HAL.cpp b/hal/src/main/native/athena/HAL.cpp
index 2d37e908df..9ad6a2c734 100644
--- a/hal/src/main/native/athena/HAL.cpp
+++ b/hal/src/main/native/athena/HAL.cpp
@@ -448,10 +448,4 @@ int64_t HAL_Report(int32_t resource, int32_t instanceNumber, int32_t context,
       resource, instanceNumber, context, feature);
 }
 
-// TODO: HACKS
-// No need for header definitions, as we should not run from user code.
-void NumericArrayResize(void) {}
-void RTSetCleanupProc(void) {}
-void EDVR_CreateReference(void) {}
-
 }  // extern "C"
diff --git a/shared/config.gradle b/shared/config.gradle
index 83dcd8fd90..4243a2b1a1 100644
--- a/shared/config.gradle
+++ b/shared/config.gradle
@@ -10,7 +10,7 @@ nativeUtils {
     wpi {
         configureDependencies {
             wpiVersion = "-1"
-            niLibVersion = "2020.10.1"
+            niLibVersion = "2022.2.2"
             opencvVersion = "4.5.2-1"
             googleTestVersion = "1.9.0-5-437e100-1"
             imguiVersion = "1.82-1"