@@ -451,7 +451,7 @@ private void registerSharedOnlyStandardDependency(
451
451
452
452
private void registerStaticOnlyStandardDependency (
453
453
ExtensiblePolymorphicDomainObjectContainer <NativeDependency > configs ,
454
- String name , Provider < String > groupId , String artifactId , Property <String > version ) {
454
+ String name , String groupId , String artifactId , Property <String > version ) {
455
455
configs .register (name + "_static" , WPIStaticMavenDependency .class , c -> {
456
456
c .getGroupId ().set (groupId );
457
457
c .getArtifactId ().set (artifactId );
@@ -563,13 +563,11 @@ public void configureDependencies(Action<DependencyVersions> dependencies) {
563
563
564
564
Provider <String > opencvYearGroup = provider
565
565
.provider (() -> "edu.wpi.first.thirdparty." + dependencyVersions .getOpencvYear ().get () + ".opencv" );
566
- Provider <String > googleTestYearGroup = provider
567
- .provider (() -> "edu.wpi.first.thirdparty." + dependencyVersions .getGoogleTestYear ().get ());
568
566
569
567
registerStandardDependency (configs , "opencv" , opencvYearGroup , "opencv-cpp" ,
570
568
dependencyVersions .getOpencvVersion ());
571
- registerStaticOnlyStandardDependency (configs , "googletest" , googleTestYearGroup , "googletest" ,
572
- dependencyVersions . getGoogleTestVersion () );
569
+ registerStaticOnlyStandardDependency (configs , "googletest" , "edu.wpi.first.thirdparty.googletest" , "googletest-cpp " ,
570
+ wpiVersion );
573
571
574
572
configs .register ("wpilib_jni" , AllPlatformsCombinedNativeDependency .class , c -> {
575
573
ListProperty <String > d = c .getDependencies ();
0 commit comments