Merge pull request #9 from modular-ftc/update-to-5.2

Update to 5.2

build.gradle

@@ -7,7 +7,7 @@ buildscript {
  jcenter()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:3.3.0'
+ classpath 'com.android.tools.build:gradle:3.5.0'
  classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
  // NOTE: Do not place your application dependencies here; they belong
  // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Oct 30 19:28:07 CDT 2017
+#Wed Sep 25 19:49:00 CDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-5.4.1-all.zip

library/build.gradle

@@ -9,7 +9,7 @@ android {
  //noinspection ExpiredTargetSdkVersion
  targetSdkVersion 19
  versionCode 13
- versionName "4.3.1"
+ versionName "5.2.0"
  testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
  ndk {
@@ -35,17 +35,19 @@ project.archivesBaseName = 'robotcore-repackaged'
 
 dependencies {
  // Original dependencies
- implementation "org.first.ftc:tensorflow-lite:4.3"
- implementation "org.first.ftc:tfod:4.3"
+ implementation "org.first.ftc:tensorflow-lite:5.2"
+ implementation "org.first.ftc:tfod:5.2"
 
  // Repackaged dependencies
- implementation 'com.github.modular-ftc:vuforia-repackaged:4.3.0'
+ implementation 'com.github.modular-ftc:vuforia-repackaged:5.2.0'
 
  // Android dependencies
  implementation 'com.android.support:support-annotations:28.0.0'
  implementation 'com.google.code.gson:gson:2.8.5'
  implementation 'org.danilopianini:gson-extras:0.2.1'
  implementation 'com.google.errorprone:javac:1.8.0-u20'
+ implementation 'com.android.support:support-v4:27.1.1'
+ implementation 'androidx.versionedparcelable:versionedparcelable:1.1.0'
 
 }
 

library/src/main/AndroidManifest.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http:https://schemas.android.com/apk/res/android"
  package="com.qualcomm.robotcore"
- android:versionCode="55"
- android:versionName="8.9" >
+ android:versionCode="64"
+ android:versionName="11.6" >
+
+ <uses-sdk android:targetSdkVersion="26" />
 
  <uses-permission
  android:name="android.permission.ACCESS_WIFI_STATE"
@@ -20,22 +22,19 @@
  <uses-permission
  android:name="android.permission.INTERNET"
  android:required="true" />
+
+ <!-- Classified as Dangerous Permission in SDK 26 -->
  <uses-permission
  android:name="android.permission.WRITE_EXTERNAL_STORAGE"
  android:required="true" />
+ <!-- Classified as Dangerous Permission in SDK 26 -->
  <uses-permission
  android:name="android.permission.READ_EXTERNAL_STORAGE"
  android:required="true" />
- <uses-permission
- android:name="android.permission.WRITE_SETTINGS"
- android:required="true" />
 
- <!--
- "Allows applications to access serial ports via the SerialManager.". So, uncertain we need,
- as we don't use the SerialManager.
- -->
+ <!-- Classified as System Permission in SDK 26 -->
  <uses-permission
- android:name="android.permission.SERIAL_PORT"
+ android:name="android.permission.WRITE_SETTINGS"
  android:required="true" />
 
  <!-- see AppUtil.setTimeZone() -->
@@ -53,6 +52,9 @@
  android:required="true" />
  <uses-permission android:name="android.permission.CAMERA" />
  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+ <uses-permission
+ android:name="com.revrobotics.permission.UPDATE_CONTROL_HUB"
+ android:required="true" />
 
  <uses-feature android:name="android.hardware.usb.accessory" />
  <uses-feature android:glEsVersion="0x00020000" />
@@ -84,12 +86,21 @@
 
  <!-- Service that provides build services for OnBotJava -->
  <service
- android:name="org.firstinspires.ftc.robotcore.internal.opmode.OnBotJavaService"
+ android:name="org.firstinspires.ftc.onbotjava.OnBotJavaService"
  android:enabled="true" />
 
  <meta-data
- android:name="autoStartService.org.firstinspires.ftc.robotcore.internal.opmode.OnBotJavaService"
+ android:name="autoStartService.org.firstinspires.ftc.onbotjava.OnBotJavaService"
  android:value="RC|2000" />
+
+ <receiver
+ android:name="org.firstinspires.ftc.robotserver.internal.webserver.controlhubupdater.ChUpdaterCommManager$ChUpdaterBroadcastReceiver"
+ android:exported="true"
+ android:permission="android.permission.INSTALL_PACKAGES" >
+ <intent-filter>
+ <action android:name="com.revrobotics.controlhubupdater.broadcast.RESULT_BROADCAST" />
+ </intent-filter>
+ </receiver>
  </application>
 
 </manifest>