Bump wpilib versions to 2024 beta 1 (#947)

shared/common.gradle

@@ -36,10 +36,10 @@ dependencies {
     implementation wpilibTools.deps.wpilibJava("hal")
     implementation wpilibTools.deps.wpilibJava("wpilibj")
 
-    implementation "edu.wpi.first.thirdparty.frc2023.opencv:opencv-java:$opencvVersion"
-    implementation "edu.wpi.first.thirdparty.frc2023.opencv:opencv-jni:$opencvVersion:$jniPlatform"
+    implementation "edu.wpi.first.thirdparty.frc2024.opencv:opencv-java:$openCVversion"
+    implementation "edu.wpi.first.thirdparty.frc2024.opencv:opencv-jni:$openCVversion:$jniPlatform"
 
-    implementation "org.ejml:ejml-simple:0.41"
+    implementation "org.ejml:ejml-simple:0.42"
 
     // test stuff
     testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
@@ -51,6 +51,7 @@ test {
         events "passed", "skipped", "failed", "standardOut", "standardError"
     }
     workingDir = new File("${rootDir}")
+    finalizedBy jacocoTestReport
 }
 
 task testHeadless(type: Test) {
@@ -67,11 +68,19 @@ task generateJavaDocs(type: Javadoc) {
     destinationDir = file("${projectDir}/build/docs")
 }
 
+
+jacoco {
+    toolVersion = "0.8.9"
+    reportsDirectory = layout.buildDirectory.dir('customJacocoReportDir')
+}
+
 jacocoTestReport {
-//    dependsOn testHeadless // Tests are required to run before generating the report
+    dependsOn testHeadless
 
     reports {
-        xml.enabled true
+        xml.required = true
+        csv.required = false
+        html.outputLocation = layout.buildDirectory.dir('jacocoHtml')
     }
 
     afterEvaluate {

shared/config.gradle

@@ -6,11 +6,14 @@ nativeUtils.withCrossLinuxArm64()
 
 // Configure WPI dependencies.
 nativeUtils.wpi.configureDependencies {
+    opencvYear = 'frc2024'
+    googleTestYear = "frc2023"
+
     wpiVersion = wpilibVersion
     wpimathVersion = wpilibVersion
-    niLibVersion = "2023.3.0"
-    opencvVersion = "4.6.0-4"
-    googleTestVersion = "1.12.1-1"
+    niLibVersion = "2024.1.1"
+    opencvVersion = openCVversion
+    googleTestVersion = "1.12.1-2"
     imguiVersion = "1.86-1"
 }
 
@@ -91,7 +94,7 @@ ext.createComponentZipTasks = { components, names, base, type, project, func ->
         def task = project.tasks.create(base + "-${key}", type) {
             description = 'Creates component archive for platform ' + key
             destinationDirectory = outputsFolder
-            classifier = key
+            archiveClassifier = key
             archiveBaseName = '_M_' + base
             duplicatesStrategy = 'exclude'
 
@@ -125,7 +128,7 @@ ext.createAllCombined = { list, name, base, type, project ->
 
         list.each {
             if (it.name.endsWith('debug')) return
-            from project.zipTree(it.archivePath)
+            from project.zipTree(it.archiveFile)
             dependsOn it
         }
     }