Update to FTC 3.7

modular-ftc · Aug 14, 2018 · 0eab524 · 0eab524
1 parent b5d494e
commit 0eab524
Show file tree

Hide file tree

Showing 19 changed files with 2,838 additions and 3,256 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
  jcenter()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:3.0.0'
+ classpath 'com.android.tools.build:gradle:3.1.4'
  classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
  // NOTE: Do not place your application dependencies here; they belong
  // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.2.1-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.5.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -6,8 +6,8 @@ android {
  defaultConfig {
  minSdkVersion 19
  targetSdkVersion 19
- versionCode 8
- versionName "3.5.5"
+ versionCode 10
+ versionName "3.7.0"
  testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
  ndk {
@@ -29,11 +29,11 @@ version = android.defaultConfig.versionName
 project.archivesBaseName = 'robotcore-repackaged'
 
 dependencies {
- implementation 'com.android.support:support-annotations:27.0.0'
+ implementation 'com.android.support:support-annotations:27.1.1'
 
- implementation 'com.github.modular-ftc:vuforia-repackaged:3.5.0'
+ implementation 'com.github.modular-ftc:vuforia-repackaged:3.7.0'
 
- implementation 'com.google.code.gson:gson:2.8.2'
+ 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'

diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http:https://schemas.android.com/apk/res/android"
  package="com.qualcomm.robotcore">
 
@@ -57,7 +58,7 @@
  -->
  <uses-feature android:name="android.hardware.camera" />
 
- <application android:name="org.firstinspires.ftc.robotcore.internal.system.RobotApplication">
+ <application android:name="org.firstinspires.ftc.robotcore.internal.system.RobotApplication" >
 
  <!-- Service that keeps desktop folders up to date with respect to actual phone file system contents -->
  <service
@@ -78,4 +79,4 @@
  android:value="RC|2000" />
  </application>
 
-</manifest>
+</manifest>
diff --git a/library/src/main/assets/connection.html b/library/src/main/assets/connection.html
@@ -112,33 +112,30 @@
 
  refreshServerStatus();
 
-
 </script>
 
 <div class="bordered-text-block">
- <h1>Robot Controller Connection Info</h1>
- <p class="web_server_banter">The <span id="id_span_connected">connected </span>robot controller,
- <span id="id_rc_name">(name)</span>, resides on the wireless network named:</p>
- <p class="web_server_datum"><span id="id_network_name">(network)</span></p>
-
- <p class="web_server_banter">The passphrase for this network is:</p>
- <p class="web_server_datum"><span id="id_passphrase">(passphrase)</span></p>
-
- <div id="id_when_android">
- <p class="web_server_banter">To <em>remotely</em> connect to the controller, connect your
- laptop's wireless adapter to this network, using
- the passphrase to gain access. Once connected, enter the following address into your web
- browser:</p>
- <p class="web_server_datum"><span id="id_server_url">(url)</span></p>
- </div>
+<h1>Robot Controller Connection Info</h1>
+<p class="web_server_banter">The <span id="id_span_connected">connected </span>robot controller, <span id="id_rc_name">(name)</span>, resides on the wireless network named:</p>
+<p class="web_server_datum"><span id="id_network_name">(network)</span></p>
+
+<p class="web_server_banter">The passphrase for this network is:</p>
+<p class="web_server_datum"><span id="id_passphrase">(passphrase)</span></p>
+
+<div id="id_when_android">
+<p class="web_server_banter">To <em>remotely</em> connect to the controller, connect your laptop's wireless adapter to this network, using
+ the passphrase to gain access. Once connected, enter the following address into your web
+ browser:</p>
+<p class="web_server_datum"><span id="id_server_url">(url)</span></p>
+</div>
 </div>
 
 <div class="bordered-text-block">
- <p class="web_server_banter_header">Robot controller status:</p>
- <p class="web_server_datum"><span id="id_server_status">(status)</span></p>
+<p class="web_server_banter_header">Robot controller status:</p>
+<p class="web_server_datum"><span id="id_server_status">(status)</span></p>
 
- <p class="web_server_banter_header">Active connections:</p>
- <div id="id_active_connections"><p class="active_connections_none">&lt;none&gt;</p></div>
+<p class="web_server_banter_header">Active connections:</p>
+<div id="id_active_connections"><p class="active_connections_none">&lt;none&gt;</p></div>
 </div>
 
 </body>