fix

technototes · Sep 28, 2020 · 78e037b · 78e037b
1 parent 2b1d351
commit 78e037b
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 12 deletions.
diff --git a/RobotCore/build.gradle b/RobotCore/build.gradle
@@ -20,8 +20,10 @@ dependencies {
      */
     api fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
     api 'com.google.code.gson:gson:2.8.0'
-    //api 'org.openftc:tfod-google-ftcsdk-repackaged:6.0' //Specific version of TFOD core library used by FTC SDK
-    //api 'org.openftc:tfod-ftc-repackaged:6.0' //FTC specific addons to core TFOD lib
+    api 'org.openftc:tfod-google-ftcsdk-repackaged:5.0' //Specific version of TFOD core library used by FTC SDK
+    api 'org.openftc:tfod-ftc-repackaged:5.0' //FTC specific addons to core TFOD lib
     api 'androidx.annotation:annotation:1.1.0'
     api 'androidx.core:core:1.3.0'
+
 }
+
diff --git a/RobotLibrary/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/RobotLibrary/build/intermediates/incremental/debug-mergeJavaRes/merge-state
diff --git a/RobotLibrary/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/RobotLibrary/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Alex Stedman\StudioProjects\FtcSamples-master\RobotLibrary\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Alex Stedman\StudioProjects\FtcSamples-master\RobotLibrary\src\debug\jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Alex Stedman\StudioProjects\TechnoLib\RobotLibrary\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Alex Stedman\StudioProjects\TechnoLib\RobotLibrary\src\debug\jniLibs"/></dataSet></merger>
diff --git a/RobotLibrary/build/intermediates/incremental/mergeDebugShaders/merger.xml b/RobotLibrary/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Alex Stedman\StudioProjects\FtcSamples-master\RobotLibrary\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Alex Stedman\StudioProjects\FtcSamples-master\RobotLibrary\src\debug\shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Alex Stedman\StudioProjects\TechnoLib\RobotLibrary\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Alex Stedman\StudioProjects\TechnoLib\RobotLibrary\src\debug\shaders"/></dataSet></merger>
diff --git a/RobotLibrary/build/intermediates/incremental/packageDebugAssets/merger.xml b/RobotLibrary/build/intermediates/incremental/packageDebugAssets/merger.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Alex Stedman\StudioProjects\FtcSamples-master\RobotLibrary\src\main\assets"/><source path="C:\Users\Alex Stedman\StudioProjects\FtcSamples-master\RobotLibrary\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Alex Stedman\StudioProjects\FtcSamples-master\RobotLibrary\src\debug\assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Alex Stedman\StudioProjects\TechnoLib\RobotLibrary\src\main\assets"/><source path="C:\Users\Alex Stedman\StudioProjects\TechnoLib\RobotLibrary\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Alex Stedman\StudioProjects\TechnoLib\RobotLibrary\src\debug\assets"/></dataSet></merger>
diff --git a/RobotLibrary/build/intermediates/packaged-classes/debug/classes.jar b/RobotLibrary/build/intermediates/packaged-classes/debug/classes.jar
diff --git a/RobotLibrary/build/outputs/aar/RobotLibrary-debug.aar b/RobotLibrary/build/outputs/aar/RobotLibrary-debug.aar
diff --git a/RobotLibrary/src/main/java/com/technototes/library/logging/Logger.java b/RobotLibrary/src/main/java/com/technototes/library/logging/Logger.java
@@ -3,9 +3,7 @@
 import com.technototes.library.logging.entry.*;
 import org.firstinspires.ftc.robotcore.external.Telemetry;
 
-import java.awt.*;
 import java.lang.annotation.Annotation;
-import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

diff --git a/RobotLibrary/src/main/java/com/technototes/library/logging/entry/NumberBarEntry.java b/RobotLibrary/src/main/java/com/technototes/library/logging/entry/NumberBarEntry.java
@@ -2,7 +2,6 @@
 
 import com.technototes.library.logging.Dimension;
 
-import java.awt.*;
 import java.util.function.Supplier;
 
 public class NumberBarEntry extends NumberSliderEntry {

diff --git a/RobotLibrary/src/main/java/com/technototes/library/logging/entry/NumberEntry.java b/RobotLibrary/src/main/java/com/technototes/library/logging/entry/NumberEntry.java
@@ -2,7 +2,6 @@
 
 import com.technototes.library.logging.Dimension;
 
-import java.awt.*;
 import java.util.function.Supplier;
 
 public class NumberEntry extends Entry<Number>{

diff --git a/RobotLibrary/src/main/java/com/technototes/library/logging/entry/NumberSliderEntry.java b/RobotLibrary/src/main/java/com/technototes/library/logging/entry/NumberSliderEntry.java
@@ -2,7 +2,6 @@
 
 import com.technototes.library.logging.Dimension;
 
-import java.awt.*;
 import java.util.function.Supplier;
 
 public class NumberSliderEntry extends NumberEntry{

diff --git a/RobotLibrary/src/main/java/com/technototes/library/logging/entry/StringEntry.java b/RobotLibrary/src/main/java/com/technototes/library/logging/entry/StringEntry.java
@@ -2,7 +2,6 @@
 
 import com.technototes.library.logging.Dimension;
 
-import java.awt.*;
 import java.util.function.Supplier;
 
 public class StringEntry extends Entry<String>{

diff --git a/RobotLibrary/src/main/java/com/technototes/library/vision/Vision.java b/RobotLibrary/src/main/java/com/technototes/library/vision/Vision.java
@@ -10,7 +10,6 @@
 import org.firstinspires.ftc.robotcore.external.Telemetry;
 import org.firstinspires.ftc.robotcore.external.navigation.VuforiaLocalizer;
 
-import java.awt.*;
 
 import java.util.ArrayList;