diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index a4f19e52b4..9d0f683784 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -9,5 +9,5 @@ repositories { } } dependencies { - implementation "edu.wpi.first:native-utils:2025.0.0" + implementation "edu.wpi.first:native-utils:2025.1.0" } diff --git a/developerRobot/build.gradle b/developerRobot/build.gradle index 96cf8c2a6d..684d0ae63d 100644 --- a/developerRobot/build.gradle +++ b/developerRobot/build.gradle @@ -269,8 +269,6 @@ model { def filePath = it.tasks.install.installDirectory.get().toString() + File.separatorChar + 'lib' run.dependsOn it.tasks.install run.systemProperty 'java.library.path', filePath - run.environment 'LD_LIBRARY_PATH', filePath - run.environment 'DYLD_LIBRARY_PATH', filePath def installTask = it.tasks.install @@ -297,8 +295,6 @@ model { runTask.doFirst doFirstTask run.doFirst doFirstTask - run.workingDir filePath - found = true } } diff --git a/shared/config.gradle b/shared/config.gradle index 5acadb030b..6c4f3942b4 100644 --- a/shared/config.gradle +++ b/shared/config.gradle @@ -16,7 +16,7 @@ nativeUtils { opencvYear = "frc2024" googleTestYear = "frc2024" niLibVersion = "2024.2.1" - opencvVersion = "4.8.0-2" + opencvVersion = "4.8.0-4" googleTestVersion = "1.14.0-1" } } @@ -34,15 +34,6 @@ nativeUtils.enableSourceLink() nativeUtils.wpi.addMacMinimumVersionArg() -nativeUtils.platformConfigs.each { - if (it.name.contains('osx')) { - it.linker.args << '-Wl,-rpath,\'@loader_path\'' - it.linker.args << "-headerpad_max_install_names" - } else if (it.name.contains('linux')) { - it.linker.args << '-Wl,-rpath,\'$ORIGIN\'' - } -} - // Compress debug info on Linux nativeUtils.platformConfigs.each { if (it.name.contains('linux')) { @@ -50,11 +41,6 @@ nativeUtils.platformConfigs.each { } } -// NativeUtils adds the following OpenCV warning suppression for Linux, but not -// for macOS -// https://github.com/opencv/opencv/issues/20269 -nativeUtils.platformConfigs.osxuniversal.cppCompiler.args.add("-Wno-deprecated-anon-enum-enum-conversion") - nativeUtils.platformConfigs.linuxathena.linker.args.add("-Wl,--fatal-warnings") model { diff --git a/shared/javacpp/setupBuild.gradle b/shared/javacpp/setupBuild.gradle index 1f3ff10acc..fa4965a23d 100644 --- a/shared/javacpp/setupBuild.gradle +++ b/shared/javacpp/setupBuild.gradle @@ -163,14 +163,8 @@ model { def filePath = it.tasks.install.installDirectory.get().toString() + File.separatorChar + 'lib' test.dependsOn it.tasks.install test.systemProperty 'java.library.path', filePath - test.environment 'LD_LIBRARY_PATH', filePath - test.environment 'DYLD_LIBRARY_PATH', filePath - test.workingDir filePath run.dependsOn it.tasks.install run.systemProperty 'java.library.path', filePath - run.environment 'LD_LIBRARY_PATH', filePath - run.environment 'DYLD_LIBRARY_PATH', filePath - run.workingDir filePath found = true } diff --git a/shared/jni/setupBuild.gradle b/shared/jni/setupBuild.gradle index fda467366e..343b75eb4c 100644 --- a/shared/jni/setupBuild.gradle +++ b/shared/jni/setupBuild.gradle @@ -314,14 +314,8 @@ model { } test.systemProperty 'java.library.path', filePath - test.environment 'LD_LIBRARY_PATH', filePath - test.environment 'DYLD_LIBRARY_PATH', filePath - test.workingDir filePath run.dependsOn it.tasks.install run.systemProperty 'java.library.path', filePath - run.environment 'LD_LIBRARY_PATH', filePath - run.environment 'DYLD_LIBRARY_PATH', filePath - run.workingDir filePath found = true } diff --git a/shared/opencv.gradle b/shared/opencv.gradle index 7f5e881998..dec6793c03 100644 --- a/shared/opencv.gradle +++ b/shared/opencv.gradle @@ -1,4 +1,4 @@ -def opencvVersion = '4.8.0-2' +def opencvVersion = '4.8.0-4' if (project.hasProperty('useCpp') && project.useCpp) { model { diff --git a/wpilibj/build.gradle b/wpilibj/build.gradle index b31630e70e..5105f3e4e4 100644 --- a/wpilibj/build.gradle +++ b/wpilibj/build.gradle @@ -143,14 +143,8 @@ model { def filePath = it.tasks.install.installDirectory.get().toString() + File.separatorChar + 'lib' test.dependsOn it.tasks.install test.systemProperty 'java.library.path', filePath - test.environment 'LD_LIBRARY_PATH', filePath - test.environment 'DYLD_LIBRARY_PATH', filePath - test.workingDir filePath run.dependsOn it.tasks.install run.systemProperty 'java.library.path', filePath - run.environment 'LD_LIBRARY_PATH', filePath - run.environment 'DYLD_LIBRARY_PATH', filePath - run.workingDir filePath found = true } diff --git a/wpilibjExamples/build.gradle b/wpilibjExamples/build.gradle index 4caafc2571..37b6d95cc9 100644 --- a/wpilibjExamples/build.gradle +++ b/wpilibjExamples/build.gradle @@ -154,9 +154,6 @@ model { commandLine it.tasks.install.runScriptFile.get().asFile.toString() test.dependsOn it.tasks.install test.systemProperty 'java.library.path', filePath - test.environment 'LD_LIBRARY_PATH', filePath - test.environment 'DYLD_LIBRARY_PATH', filePath - test.workingDir filePath } new groovy.json.JsonSlurper().parseText(exampleFile.text).each { entry -> @@ -166,9 +163,6 @@ model { run.classpath = sourceSets.main.runtimeClasspath run.dependsOn it.tasks.install run.systemProperty 'java.library.path', filePath - run.environment 'LD_LIBRARY_PATH', filePath - run.environment 'DYLD_LIBRARY_PATH', filePath - run.workingDir filePath doFirst { doFirstTask(run) } if (org.gradle.internal.os.OperatingSystem.current().isMacOsX()) { @@ -199,9 +193,6 @@ model { exceptionFormat "full" } testTask.systemProperty 'java.library.path', filePath - testTask.environment 'LD_LIBRARY_PATH', filePath - testTask.environment 'DYLD_LIBRARY_PATH', filePath - testTask.workingDir filePath if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxarm32') || project.hasProperty('onlylinuxarm64') || project.hasProperty('onlywindowsarm64')) { testTask.enabled = false