diff --git a/build.gradle.kts b/build.gradle.kts index 4bed8ec763..95ab633519 100644 --- 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 index 962dc89d17..b95add4fe3 100644 --- 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") {