Skip to content

Commit 16fc0ac

Browse files
author
James Hagborg
committed
Roll back some versions for 2018
1 parent 2952726 commit 16fc0ac

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

build.gradle

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,27 @@ allprojects {
2121
}
2222
}
2323

24-
def WPILIB_VER = '2019.1.1-beta-1'
25-
def OPENCV_VER = '3.4.3-15'
24+
def WPILIB_VER = '2018.4.1'
25+
def NTCORE_VER = '4.1.0'
26+
def OPENCV_VER = '3.2.0'
27+
def WPIUTIL_VER = '3.2.0'
28+
def CSCORE_VER = '1.3.0'
2629
def JUNIT_VER = '5.3.1'
2730

2831
dependencies {
2932
// We may or may not need to add the new HAL library which was split off
3033
// from wpilib. Ideally we don't have to touch it at all.
3134
compile "edu.wpi.first.wpilibj:wpilibj-java:$WPILIB_VER"
32-
compile "edu.wpi.first.ntcore:ntcore-java:$WPILIB_VER"
33-
compile "edu.wpi.first.wpiutil:wpiutil-java:$WPILIB_VER"
34-
compile "edu.wpi.first.cscore:cscore-java:$WPILIB_VER"
35-
compile "edu.wpi.first.cameraserver:cameraserver-java:$WPILIB_VER"
36-
compile "edu.wpi.first.thirdparty.frc2019.opencv:opencv-java:$OPENCV_VER"
35+
compile "edu.wpi.first.ntcore:ntcore-java:$NTCORE_VER"
36+
compile "edu.wpi.first.wpiutil:wpiutil-java:$WPIUTIL_VER"
37+
compile "edu.wpi.first.cscore:cscore-java:$CSCORE_VER"
38+
//compile "edu.wpi.first.cameraserver:cameraserver-java:$WPILIB_VER"
39+
compile "org.opencv:opencv-java:$OPENCV_VER"
3740

3841
// Do not require these as runtime dependencies, since WPILib doesn't.
3942
// The user can figure out what version they need (RIO vs. desktop).
40-
testRuntime "edu.wpi.first.ntcore:ntcore-jni:$WPILIB_VER:all"
41-
testRuntime "edu.wpi.first.cscore:cscore-jni:$WPILIB_VER:all"
43+
testRuntime "edu.wpi.first.ntcore:ntcore-jni:$NTCORE_VER:all"
44+
testRuntime "edu.wpi.first.cscore:cscore-jni:$CSCORE_VER:all"
4245
testRuntime "org.junit.jupiter:junit-jupiter-engine:$JUNIT_VER"
4346

4447
testCompile "org.junit.jupiter:junit-jupiter-api:$JUNIT_VER"

src/main/java/org/hyperonline/hyperlib/vision/FindTargetsPipeline.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.opencv.imgproc.Imgproc;
1515

1616
import edu.wpi.cscore.CvSource;
17-
import edu.wpi.first.cameraserver.CameraServer;
17+
import edu.wpi.first.wpilibj.CameraServer;
1818

1919
/**
2020
* A pipeline which finds rectangles within a given color range.

src/main/java/org/hyperonline/hyperlib/vision/VisionGUIPipeline.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.opencv.core.Mat;
44

5-
import edu.wpi.first.vision.VisionPipeline;
5+
import edu.wpi.first.wpilibj.vision.VisionPipeline;
66

77
/**
88
* A pipeline which has separate methods for processing an input image and

src/main/java/org/hyperonline/hyperlib/vision/VisionModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import edu.wpi.cscore.CvSource;
1111
import edu.wpi.cscore.VideoMode;
1212
import edu.wpi.cscore.VideoSource;
13-
import edu.wpi.first.cameraserver.CameraServer;
13+
import edu.wpi.first.wpilibj.CameraServer;
1414
import edu.wpi.first.wpilibj.DriverStation;
1515

1616
/**

0 commit comments

Comments
 (0)