From eae148454e25a3b95c6c24587a7d242a8deb512f Mon Sep 17 00:00:00 2001
From: Thad House <ThadHouse@users.noreply.github.com>
Date: Wed, 18 Sep 2024 18:51:35 -0700
Subject: [PATCH] Switch to monorepo gtest (#742)

Bump native-utils to 2025.3.0

Co-authored-by: Peter Johnson <johnson.peter@gmail.com>
---
 build.gradle                                                   | 2 +-
 src/main/java/edu/wpi/first/gradlerio/wpi/WPIExtension.java    | 2 --
 .../java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java | 3 ---
 .../edu/wpi/first/gradlerio/wpi/cpp/WPINativeExtension.java    | 2 --
 versionupdates.gradle                                          | 1 -
 5 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index ca924c98..d3604dc8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ repositories {
 dependencies {
     api 'com.google.code.gson:gson:2.8.6'
 
-    api 'edu.wpi.first:native-utils:2024.6.1'
+    api 'edu.wpi.first:native-utils:2025.3.0'
 
     api 'de.undercouch:gradle-download-task:4.1.2'
 
diff --git a/src/main/java/edu/wpi/first/gradlerio/wpi/WPIExtension.java b/src/main/java/edu/wpi/first/gradlerio/wpi/WPIExtension.java
index ca2c6bf9..77c45648 100644
--- a/src/main/java/edu/wpi/first/gradlerio/wpi/WPIExtension.java
+++ b/src/main/java/edu/wpi/first/gradlerio/wpi/WPIExtension.java
@@ -147,8 +147,6 @@ private static File computeHomeRoot() {
     // "wpilibVersion" : new Tuple("WPILib", wpilibVersion, "wpilib"),
     // "opencvVersion" : new Tuple("OpenCV", opencvVersion, "opencv"),
     // "frcYear " : new Tuple("FRC Year", frcYear, "frcYear"),
-    // "googleTestVersion" : new Tuple("Google Test", googleTestVersion,
-    // "googleTest"),
     // "imguiVersion" : new Tuple("ImGUI", imguiVersion, "imgui"),
     // "wpimathVersion" : new Tuple("WPIMath", wpimathVersion, "wpimath"),
     // "ejmlVersion" : new Tuple("EJML", ejmlVersion, "ejml"),
diff --git a/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java b/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java
index 48bda9bb..b926c8e1 100644
--- a/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java
+++ b/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java
@@ -14,7 +14,6 @@ public abstract class WPIVersionsExtension {
     private static final String jacksonVersion = "2.15.2";
     private static final String quickbufVersion = "1.3.3";
     private static final String wpimathVersion = "2025.0.0-alpha-2";
-    private static final String googleTestVersion = "1.14.0-1";
 
     private static final String smartDashboardVersion = "2025.0.0-alpha-1";
     private static final String shuffleboardVersion = "2025.0.0-alpha-2";
@@ -30,7 +29,6 @@ public abstract class WPIVersionsExtension {
     public abstract Property<String> getWpilibVersion();
     public abstract Property<String> getNiLibrariesVersion();
     public abstract Property<String> getOpencvVersion();
-    public abstract Property<String> getGoogleTestVersion();
     public abstract Property<String> getImguiVersion();
     public abstract Property<String> getWpimathVersion();
 
@@ -52,7 +50,6 @@ public WPIVersionsExtension() {
         getWpilibVersion().convention(wpilibVersion);
         getNiLibrariesVersion().convention(niLibrariesVersion);
         getOpencvVersion().convention(opencvVersion);
-        getGoogleTestVersion().convention(googleTestVersion);
         getImguiVersion().convention(imguiVersion);
         getWpimathVersion().convention(wpimathVersion);
 
diff --git a/src/main/java/edu/wpi/first/gradlerio/wpi/cpp/WPINativeExtension.java b/src/main/java/edu/wpi/first/gradlerio/wpi/cpp/WPINativeExtension.java
index 7cbc1137..bafa05e2 100644
--- a/src/main/java/edu/wpi/first/gradlerio/wpi/cpp/WPINativeExtension.java
+++ b/src/main/java/edu/wpi/first/gradlerio/wpi/cpp/WPINativeExtension.java
@@ -118,12 +118,10 @@ public WPINativeExtension(Project project, WPIExtension wpi, WPIVersionsExtensio
         // nte.setSinglePrintPerPlatform();
 
         nte.getWpi().configureDependencies(wpiDeps -> {
-            wpiDeps.getGoogleTestYear().set("frc2024");
             wpiDeps.getOpencvYear().set("frc2024");
             wpiDeps.getWpiVersion().set(versions.getWpilibVersion());
             wpiDeps.getNiLibVersion().set(versions.getNiLibrariesVersion());
             wpiDeps.getOpencvVersion().set(versions.getOpencvVersion());
-            wpiDeps.getGoogleTestVersion().set(versions.getGoogleTestVersion());
             wpiDeps.getImguiVersion().set(versions.getImguiVersion());
             wpiDeps.getWpimathVersion().set(versions.getWpimathVersion());
         });
diff --git a/versionupdates.gradle b/versionupdates.gradle
index c19811cc..8f76cad4 100644
--- a/versionupdates.gradle
+++ b/versionupdates.gradle
@@ -11,7 +11,6 @@ def versionMap = [
   roboRIOTeamNumberSetterVersion: 'edu.wpi.first.tools:roboRIOTeamNumberSetter:+:windowsx86-64@zip',
   dataLogToolVersion: 'edu.wpi.first.tools:DataLogTool:+:windowsx86-64@zip',
   opencvVersion: 'edu.wpi.first.thirdparty.frc2024.opencv:opencv-java:+',
-  googleTestVersion: 'edu.wpi.first.thirdparty.frc2024:googletest:+:headers',
   niLibrariesVersion: 'edu.wpi.first.ni-libraries:runtime:+:allowedimages@zip',
   imguiVersion: 'edu.wpi.first.thirdparty.frc2024:imgui:+:headers',
   wpimathVersion: 'edu.wpi.first.wpimath:wpimath-java:+'