Update opencv-installer (#945)

SamCarlberg · web-flow · commit a781b3645658 · 2019-05-08T16:43:28.000-04:00
Install JNI to ui/build/opencv-jni by default. No more permissions issues during JNI install
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") {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ buildscript {`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`	`dependencies {`
`11`		`- classpath(group = "edu.wpi.first.wpilib.opencv", name = "opencv-installer", version = "2.0.0")`
	`11`	`+ classpath(group = "edu.wpi.first.wpilib.opencv", name = "opencv-installer", version = "2.0.1")`
`12`	`12`	`classpath("com.netflix.nebula:gradle-aggregate-javadocs-plugin:2.2.+")`
`13`	`13`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,8 +164,8 @@ tasks.register("testSharedLib") {`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`if (project.hasProperty("generation") \|\| project.hasProperty("genonly")) {`
`167`		`- val platform = Installer.getPlatform()`
`168`		`- val jniLocation: String = project.properties.getOrDefault("jniLocation", platform.defaultJniLocation()).toString()`
	`167`	`+ val defaultLocation = buildDir.resolve("opencv-jni")`
	`168`	`+ val jniLocation: String = project.properties.getOrDefault("jniLocation", defaultLocation).toString()`
`169`	`169`	`val jniPath = File(jniLocation).absolutePath`
`170`	`170`
`171`	`171`	`val installOpenCV = tasks.register("installOpenCV") {`