From b53ce1d3f09a36e7eb624a301e556c159e763d65 Mon Sep 17 00:00:00 2001
From: Thad House <ThadHouse@users.noreply.github.com>
Date: Mon, 14 Nov 2022 11:36:33 -0700
Subject: [PATCH] [build, wpiutil] Switch macos to universal binaries (#4628)

---
 .github/workflows/gradle.yml                       |  1 -
 buildSrc/build.gradle                              |  2 +-
 shared/config.gradle                               | 14 +++-----------
 shared/libssh.gradle                               |  2 +-
 wpilibNewCommands/WPILibNewCommands.json           |  3 +--
 .../java/edu/wpi/first/util/RuntimeDetector.java   |  8 +-------
 6 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index f7bd91d39c..6eb5be4313 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -66,7 +66,6 @@ jobs:
           - os: macOS-11
             artifact-name: macOS
             architecture: x64
-            build-options: "-Pbuildalldesktop"
             task: "build"
             outputs: "build/allOutputs"
           - os: windows-2022
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index e78d9cca0b..bc4e27d9d1 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -5,5 +5,5 @@ repositories {
     }
 }
 dependencies {
-    implementation "edu.wpi.first:native-utils:2023.6.1"
+    implementation "edu.wpi.first:native-utils:2023.7.0"
 }
diff --git a/shared/config.gradle b/shared/config.gradle
index 6838a7fada..1dd876b1eb 100644
--- a/shared/config.gradle
+++ b/shared/config.gradle
@@ -15,9 +15,9 @@ nativeUtils {
         configureDependencies {
             wpiVersion = "-1"
             niLibVersion = "2023.1.0"
-            opencvVersion = "4.6.0-2"
-            googleTestVersion = "1.11.0-3"
-            imguiVersion = "1.88-8"
+            opencvVersion = "4.6.0-3"
+            googleTestVersion = "1.11.0-4"
+            imguiVersion = "1.88-9"
             wpimathVersion = "-1"
         }
     }
@@ -34,14 +34,6 @@ nativeUtils.setSinglePrintPerPlatform()
 nativeUtils.enableSourceLink()
 
 nativeUtils.platformConfigs.each {
-    if (it.name.contains('windows')) {
-        it.cppCompiler.args.remove("/std:c++17")
-        it.cppCompiler.args.add("/std:c++20")
-        return
-    } else if (it.name == 'linuxx86-64' || it.name == 'osxx86-64' || it.name == 'osxarm64') {
-        it.cppCompiler.args.remove("-std=c++17")
-        it.cppCompiler.args.add("-std=c++20")
-    }
     if (it.name.contains('osx')) {
         it.linker.args << '-Wl,-rpath,\'@loader_path\''
         it.linker.args << "-headerpad_max_install_names"
diff --git a/shared/libssh.gradle b/shared/libssh.gradle
index 08fab4ff39..743dd57b7c 100644
--- a/shared/libssh.gradle
+++ b/shared/libssh.gradle
@@ -6,7 +6,7 @@ nativeUtils {
             headerClassifier = "headers"
             sourceClassifier = "sources"
             ext = "zip"
-            version = '0.95-5'
+            version = '0.95-6'
             targetPlatforms.addAll(nativeUtils.wpi.platforms.allPlatforms)
         }
     }
diff --git a/wpilibNewCommands/WPILibNewCommands.json b/wpilibNewCommands/WPILibNewCommands.json
index 22e1c6f395..da4bc52954 100644
--- a/wpilibNewCommands/WPILibNewCommands.json
+++ b/wpilibNewCommands/WPILibNewCommands.json
@@ -30,8 +30,7 @@
               "windowsx86-64",
               "windowsx86",
               "linuxx86-64",
-              "osxx86-64",
-              "osxarm64"
+              "osxuniversal"
           ]
       }
   ]
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/RuntimeDetector.java b/wpiutil/src/main/java/edu/wpi/first/util/RuntimeDetector.java
index 81a9e21dc7..550339ecad 100644
--- a/wpiutil/src/main/java/edu/wpi/first/util/RuntimeDetector.java
+++ b/wpiutil/src/main/java/edu/wpi/first/util/RuntimeDetector.java
@@ -31,13 +31,7 @@ public final class RuntimeDetector {
     } else if (isMac()) {
       filePrefix = "lib";
       fileExtension = ".dylib";
-      if (intel32) {
-        filePath = "/osx/x86/";
-      } else if (arm64) {
-        filePath = "/osx/arm64/";
-      } else {
-        filePath = "/osx/x86-64/";
-      }
+      filePath = "/osx/universal/";
     } else if (isLinux()) {
       filePrefix = "lib";
       fileExtension = ".so";