Merge pull request #43 from Pattonville-Robotics/opencv-roverruckus-u…

…pdate Update Common-Code to ftc_app 4.3
Pattonville-Robotics · Nov 11, 2018 · 0285c7b · 0285c7b
2 parents 870cfcf + 8a234ea
commit 0285c7b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext.kotlin_version = '1.2.71'
-    ext.ftc_version = '4.0'
+    ext.ftc_version = '4.3'
 
     repositories {
         google()

diff --git a/library/build.gradle b/library/build.gradle
@@ -50,15 +50,15 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     //FTC
-    implementation "com.github.modular-ftc:robotcore-repackaged:$ftc_version.1.1-lite"
+    implementation "com.github.modular-ftc:robotcore-repackaged:$ftc_version.0-lite"
     implementation "com.github.modular-ftc:ftc-common-repackaged:$ftc_version.0-lite"
     implementation "org.first.ftc:hardware:$ftc_version"
 
     //Utilities
     implementation 'org.apache.commons:commons-math3:3.6.1'
     implementation 'com.annimon:stream:1.1.9'
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
-    implementation 'com.google.guava:guava:24.1-android'
+    implementation 'com.google.guava:guava:24.1-jre'
     implementation 'com.github.modular-ftc:opencv-repackaged:3.3.1'
 
     testImplementation 'junit:junit:4.12'