Skip to content

Commit c5e7751

Browse files
authored
Switch googletest to use artifacts from monorepo (#211)
1 parent 3806241 commit c5e7751

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ nativeUtils.wpi.configureDependencies {
124124
wpiVersion = ""
125125
niLibVersion = ""
126126
opencvVersion = ""
127-
googleTestVersion = ""
128127
}
129128
130129
// The 6 below get the string representation of the main platforms

src/main/java/edu/wpi/first/nativeutils/WPINativeUtilsExtension.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ private void registerSharedOnlyStandardDependency(
451451

452452
private void registerStaticOnlyStandardDependency(
453453
ExtensiblePolymorphicDomainObjectContainer<NativeDependency> configs,
454-
String name, Provider<String> groupId, String artifactId, Property<String> version) {
454+
String name, String groupId, String artifactId, Property<String> version) {
455455
configs.register(name + "_static", WPIStaticMavenDependency.class, c -> {
456456
c.getGroupId().set(groupId);
457457
c.getArtifactId().set(artifactId);
@@ -563,13 +563,11 @@ public void configureDependencies(Action<DependencyVersions> dependencies) {
563563

564564
Provider<String> opencvYearGroup = provider
565565
.provider(() -> "edu.wpi.first.thirdparty." + dependencyVersions.getOpencvYear().get() + ".opencv");
566-
Provider<String> googleTestYearGroup = provider
567-
.provider(() -> "edu.wpi.first.thirdparty." + dependencyVersions.getGoogleTestYear().get());
568566

569567
registerStandardDependency(configs, "opencv", opencvYearGroup, "opencv-cpp",
570568
dependencyVersions.getOpencvVersion());
571-
registerStaticOnlyStandardDependency(configs, "googletest", googleTestYearGroup, "googletest",
572-
dependencyVersions.getGoogleTestVersion());
569+
registerStaticOnlyStandardDependency(configs, "googletest", "edu.wpi.first.thirdparty.googletest", "googletest-cpp",
570+
wpiVersion);
573571

574572
configs.register("wpilib_jni", AllPlatformsCombinedNativeDependency.class, c -> {
575573
ListProperty<String> d = c.getDependencies();

0 commit comments

Comments
 (0)