Merge branch 'master' of https://github.com/LucasFeldsien/UltimateGoal …

…into dev gradle is now at 7.0.0-alpha09 # Conflicts: # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Autonomous/HardwareTest.java # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/TeleOp/DriveTrainMethodTeleOp.java # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/TeleOp/GrabberTeleop.java # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/TeleOp/TeleOpExample.java
polygonnedpotato · Mar 11, 2021 · 6269b53 · 6269b53
1 parent 1fb7f26
commit 6269b53
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 19 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0-alpha08'
+        classpath 'com.android.tools.build:gradle:7.0.0-alpha09'
     }
 }
 

diff --git a/local.properties b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Tue Nov 24 10:19:14 PST 2020
-sdk.dir=/Users/lakeoswegorobotics/Library/Android/sdk
+#Wed Mar 10 20:03:22 PST 2021
+sdk.dir=/home/elburg/Android/Sdk