From 1bd8031b23ceb06ded69bec61e6802dfae18b37b Mon Sep 17 00:00:00 2001 From: serivesmejia Date: Sun, 10 Sep 2023 13:21:52 -0700 Subject: [PATCH] Fixing gradle workspaces --- EOCV-Sim/build.gradle | 4 ++-- .../resources/templates/gradle_workspace.zip | Bin 86379 -> 86686 bytes .../apriltag/AprilTagProcessorImpl.java | 2 ++ build.gradle | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/EOCV-Sim/build.gradle b/EOCV-Sim/build.gradle index f206f3c2..cd57e1b2 100644 --- 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 index 8bf3b82c2f70f6275f223ead359009cc88d26ee7..59480ce0d5cfc820f8dd1369cfecdb58380deb4a 100644 GIT binary patch delta 1270 zcmaF8h;`ml)(s)-^=mV?%t_HpFG@_wNevC*WMFPp z{Feg4r4`%^j4Ush85qFC)WCyThYfi4vj5^&6uBgqmVf;K-{RY;B4syTlVprQY<*VhX7s-X?yJaGO=V$WwMe#fl^n2R-;^4XiZ2Di4 zEDv5&aZfoSGV#)f&vs9i?B4R(>g+0knCODI7&Qk}xUu?cC;@z>&dqa_ttBGH8XPk>f*d%wQV2M?Er@byXo|tF5ca53(`iw47 zN#|`dm{0C={d})q`t<+xTMjl>c)pBU`{-chm3${#r`s$=M`LYYq+3l^rf|FwMG zrRcWur-b?ui*@>&V>m)D2qy!hrJ=TTaWw-2!$~04V33*a;KnGgR#22*kXlrdnOY2v znO_S3Qa~6jW+uPAp~URv7&KY%rWMQ93&xiw``;8}6yKbB^Ez+62+%wZh6bPwb0+Vc zv>C|b1V%nTFyf0-OG+~H(u(kd z=k!)r#&E_7)9<=6CNS=uZs*46qanu(2}I0jk^lxL0|PKT8MZX)-kfgl#;72O9A~Ty z%)b;M*6_G9$}w@>ny%x{7|tZ|czUZlqp1VTWX$M6Hu=tT2F%C;8f^gff%xQ!&n5U& zz%F565CGCQUQBoPU<_gU^`M#VU;>noIRQGbapckXa^s}Cf zPE4o3oD?RNSJNMQF{(|U>je~S0&^;uK7eVn>GORUIj7I^2Fj$r1}OuJ2u@e^0g60B zh@>-F|A0#?Opo(r^kzEEIDNezqyF?;zCg7`Oc0K*A7cX33;_^lGSf9V5N$C1x-6s2 z^a=iq4ouHfAtKLJfDY0K0Ez@!LNvxWGjdIjwqTT>eh4HS;{q4vnQkA*sKm9Kmx1A| H3n)eaXoun5 delta 966 zcmbQYl=bx@)(s)-^^c>q!q>}XdY)lmU|7h=z`(;G!;n;(nUkWIUX+-UlNuVr$-tb+ z{VxTCODnh;7+GF0GcbUOsS^yd4;u)ymN)-zW^2B+@YK4sJLVd1Nzv`9v6$|$%h@WM z^XL1CnVQRjt4=o`-`juu@rE-qx^{h=o7Fz~QhNB@ce|tO?|+SDTh`KEI%evVV>qO9G1Wvr>~w^zssOQx$9#)K$v! zi?WLg5|dNoK|<=hT)bQX-pnl113VceHh+1+6w8MiWz$*Q7*#1Ri z49Dbu91_zT+!+0so^njT;Kmrv$TeNVoiTyQoD<|9h3Tu@8MQU!8AO1t;$Xn^vx}61bT3b!mA%iWmw7UVFs*++ z{fsALB-6F$)78Bgeu&^>0Y;VSrU5`@-LepoWdV$_OtV!W9FsuCbS5?n27 eVq=*R9qMU 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 index d05cf33d..ccd58a8f 100644 --- 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 index b3952c72..02fbde3a 100644 --- 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"