Merge pull request #49 from Pattonville-Robotics/update-to-5.2

Update to 5.2

build.gradle

@@ -1,13 +1,13 @@
 buildscript {
-    ext.kotlin_version = '1.2.71'
-    ext.ftc_version = '4.3'
+    ext.kotlin_version = '1.3.41'
+    ext.ftc_version = '5.2'
 
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Aug 22 11:38:56 EDT 2016
+#Thu Sep 26 16:01:58 CDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

library/build.gradle

@@ -11,7 +11,7 @@ android {
         targetSdkVersion 19
 
         versionName "$ftc_version.0"
-        versionCode 9
+        versionCode 10
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -52,6 +52,7 @@ dependencies {
     //FTC
     implementation "com.github.modular-ftc:robotcore-repackaged:$ftc_version.0-lite"
     implementation "com.github.modular-ftc:ftc-common-repackaged:$ftc_version.0-lite"
+    implementation "com.github.modular-ftc:vuforia-repackaged:$ftc_version.0"
     implementation "org.first.ftc:hardware:$ftc_version"
 
     //Utilities
@@ -60,6 +61,10 @@ dependencies {
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
     implementation 'com.google.guava:guava:24.1-jre'
     implementation 'com.github.modular-ftc:opencv-repackaged:3.3.1'
+
+    //Android
+    implementation 'com.android.support:support-annotations:28.0.0'
+
 
     testImplementation 'junit:junit:4.12'