From 50ed55e8e2f1c791ab94c7d3fbe6c60ebd54906d Mon Sep 17 00:00:00 2001 From: Thad House Date: Sun, 13 Aug 2017 21:41:45 -0700 Subject: [PATCH] Force OpenCV to 3.1.0 (#602) Will break otherwise when I push a new version --- wpilibj/athena.gradle | 4 ++-- wpilibjIntegrationTests/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wpilibj/athena.gradle b/wpilibj/athena.gradle index fad622c81e..942d7fd75c 100644 --- a/wpilibj/athena.gradle +++ b/wpilibj/athena.gradle @@ -18,8 +18,8 @@ dependencies { athenaRuntime ntcoreDep('java', 'arm') athenaCompile cscoreDep('java', 'arm') athenaRuntime cscoreDep('java', 'arm') - athenaCompile 'org.opencv:opencv-java:+' - athenaRuntime 'org.opencv:opencv-java:+' + athenaCompile 'org.opencv:opencv-java:3.1.0' + athenaRuntime 'org.opencv:opencv-java:3.1.0' doc ntcoreDep('java', 'sources') doc cscoreDep('java', 'sources') } diff --git a/wpilibjIntegrationTests/build.gradle b/wpilibjIntegrationTests/build.gradle index bfe5dffe3f..d718183c6f 100644 --- a/wpilibjIntegrationTests/build.gradle +++ b/wpilibjIntegrationTests/build.gradle @@ -20,7 +20,7 @@ dependencies { compile files(wpilibj.sourceSets.test.output.classesDir) compile ntcoreDep('java', 'arm') compile cscoreDep('java', 'arm') - compile 'org.opencv:opencv-java:+' + compile 'org.opencv:opencv-java:3.1.0' compile 'junit:junit:4.11' compile 'com.googlecode.junit-toolbox:junit-toolbox:2.0' compile 'org.apache.ant:ant:1.9.4'