Skip to content

Commit e44637a

Browse files
authored
Remove unused dependency versions (#279)
1 parent 38fa799 commit e44637a

2 files changed

Lines changed: 3 additions & 14 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@ nativeUtils.addWpiNativeUtils()
119119
// wpilib and driver. They still need to manually be added to individual
120120
// components. These just add to the back end
121121
nativeUtils.wpi.configureDependencies {
122-
// Thse are the 6 separate versions used for wpi
122+
// These are the 3 separate versions used for wpi
123123
// deps. They should be kept in sync.
124124
wpiVersion = ""
125-
niLibVersion = ""
125+
mrcLibVersion = ""
126126
opencvVersion = ""
127127
}
128128

src/main/java/org/wpilib/nativeutils/WPINativeUtilsExtension.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -263,12 +263,6 @@ public static abstract class DependencyVersions {
263263
public abstract Property<String> getMrcLibVersion();
264264

265265
public abstract Property<String> getOpencvVersion();
266-
267-
public abstract Property<String> getGoogleTestVersion();
268-
269-
public abstract Property<String> getWpimathVersion();
270-
271-
public abstract Property<String> getImguiVersion();
272266
}
273267

274268
private void addPlatformReleaseSymbolGeneration(String platform) {
@@ -433,14 +427,9 @@ public void configureDependencies(Action<DependencyVersions> dependencies) {
433427
return;
434428
}
435429
dependencyVersions = objects.newInstance(DependencyVersions.class);
436-
437430
dependencyVersions.getWpiVersion().set("-1");
438431
dependencyVersions.getMrcLibVersion().set("-1");
439432
dependencyVersions.getOpencvVersion().set("-1");
440-
dependencyVersions.getGoogleTestVersion().set("-1");
441-
442-
dependencyVersions.getWpimathVersion().set("-1");
443-
dependencyVersions.getImguiVersion().set("-1");
444433

445434
dependencies.execute(dependencyVersions);
446435
versions = dependencyVersions;
@@ -464,7 +453,7 @@ public void configureDependencies(Action<DependencyVersions> dependencies) {
464453

465454
registerStandardDependency(configs, "opencv", "org.wpilib.thirdparty.opencv", "opencv-cpp",
466455
dependencyVersions.getOpencvVersion());
467-
registerStaticOnlyStandardDependency(configs, "googletest", "edu.wpi.first.thirdparty.googletest",
456+
registerStaticOnlyStandardDependency(configs, "googletest", "org.wpilib.thirdparty.googletest",
468457
"googletest-cpp",
469458
wpiVersion);
470459

0 commit comments

Comments
 (0)