Skip to content

Commit

Permalink
Switch to monorepo gtest (#742)
Browse files Browse the repository at this point in the history
Bump native-utils to 2025.3.0

Co-authored-by: Peter Johnson <johnson.peter@gmail.com>
  • Loading branch information
ThadHouse and PeterJohnson authored Sep 19, 2024
1 parent dceeba8 commit eae1484
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 0 additions & 2 deletions src/main/java/edu/wpi/first/gradlerio/wpi/WPIExtension.java
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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();

Expand All @@ -52,7 +50,6 @@ public WPIVersionsExtension() {
getWpilibVersion().convention(wpilibVersion);
getNiLibrariesVersion().convention(niLibrariesVersion);
getOpencvVersion().convention(opencvVersion);
getGoogleTestVersion().convention(googleTestVersion);
getImguiVersion().convention(imguiVersion);
getWpimathVersion().convention(wpimathVersion);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
});
Expand Down
1 change: 0 additions & 1 deletion versionupdates.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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:+'
Expand Down

0 comments on commit eae1484

Please sign in to comment.