Fixing gradle workspaces

deltacv · Sep 10, 2023 · 1bd8031 · 1bd8031
1 parent cf698e2
commit 1bd8031
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/EOCV-Sim/build.gradle b/EOCV-Sim/build.gradle
@@ -51,13 +51,13 @@ dependencies {
     implementation "com.github.deltacv.AprilTagDesktop:AprilTagDesktop:$apriltag_plugin_version"
 
     implementation 'info.picocli:picocli:4.6.1'
-    implementation 'com.google.code.gson:gson:2.8.7'
+    implementation 'com.google.code.gson:gson:2.8.9'
     implementation "io.github.classgraph:classgraph:$classgraph_version"
 
     implementation 'com.formdev:flatlaf:1.2'
     implementation 'com.formdev:flatlaf-intellij-themes:1.2'
 
-    implementation 'net.lingala.zip4j:zip4j:2.8.0'
+    implementation 'net.lingala.zip4j:zip4j:2.10.0'
 
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-swing:$kotlinx_coroutines_version"

diff --git a/EOCV-Sim/src/main/resources/templates/gradle_workspace.zip b/EOCV-Sim/src/main/resources/templates/gradle_workspace.zip
diff --git a/Vision/src/main/java/org/firstinspires/ftc/vision/apriltag/AprilTagProcessorImpl.java b/Vision/src/main/java/org/firstinspires/ftc/vision/apriltag/AprilTagProcessorImpl.java
@@ -35,6 +35,7 @@
 
 import android.graphics.Canvas;
 
+import com.qualcomm.robotcore.eventloop.opmode.Disabled;
 import com.qualcomm.robotcore.util.MovingStatistics;
 import com.qualcomm.robotcore.util.RobotLog;
 
@@ -60,6 +61,7 @@
 import java.util.ArrayList;
 import java.util.logging.Logger;
 
+@Disabled
 public class AprilTagProcessorImpl extends AprilTagProcessor
 {
     public static final String TAG = "AprilTagProcessorImpl";

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         kotlinx_coroutines_version = "1.5.0-native-mt"
         slf4j_version = "1.7.32"
         log4j_version = "2.17.1"
-        opencv_version = "4.5.5-1"
+        opencv_version = "4.7.0-0"
         apriltag_plugin_version = "2.0.0-C"
         skiko_version = "0.7.75"