Update opencv-installer (#945)

Install JNI to ui/build/opencv-jni by default. No more permissions issues during JNI install
WPIRoboticsProjects · May 8, 2019 · a781b36 · a781b36
1 parent 8c9afad
commit a781b36
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath(group = "edu.wpi.first.wpilib.opencv", name = "opencv-installer", version = "2.0.0")
+        classpath(group = "edu.wpi.first.wpilib.opencv", name = "opencv-installer", version = "2.0.1")
         classpath("com.netflix.nebula:gradle-aggregate-javadocs-plugin:2.2.+")
 
     }

diff --git a/ui/ui.gradle.kts b/ui/ui.gradle.kts
@@ -164,8 +164,8 @@ tasks.register("testSharedLib") {
 }
 
 if (project.hasProperty("generation") || project.hasProperty("genonly")) {
-    val platform = Installer.getPlatform()
-    val jniLocation: String = project.properties.getOrDefault("jniLocation", platform.defaultJniLocation()).toString()
+    val defaultLocation = buildDir.resolve("opencv-jni")
+    val jniLocation: String = project.properties.getOrDefault("jniLocation", defaultLocation).toString()
     val jniPath = File(jniLocation).absolutePath
 
     val installOpenCV = tasks.register("installOpenCV") {