Merge pull request #1 from modular-ftc/update-to-4.0

Update to 4.0
modular-ftc · Oct 7, 2018 · abb6cec · abb6cec
2 parents 3051d81 + b110b03
commit abb6cec
Show file tree

Hide file tree

Showing 68 changed files with 3,118 additions and 1,185 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,15 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.ftc_version = '3.7'
+    ext.ftc_version = '4.0'
 
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
+        classpath 'com.android.tools.build:gradle:3.2.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
     }

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\://services.gradle.org/distributions/gradle-4.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -8,7 +8,7 @@ android {
         targetSdkVersion 19
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
-        versionCode 43
+        versionCode 44
         versionName "$ftc_version.0"
 
         ndk {
@@ -17,6 +17,9 @@ android {
 
         consumerProguardFiles 'proguard-rules.pro'
     }
+    lintOptions {
+        abortOnError false
+    }
 }
 
 group = 'com.github.modular-ftc'

diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -3,15 +3,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.qualcomm.ftccommon">
 
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:required="true" />
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:required="true" />
-    <uses-permission
-        android:name="android.permission.WRITE_SETTINGS"
-        android:required="true" />
 
     <application
         android:allowBackup="true"
@@ -77,8 +75,8 @@
             android:label="@string/title_activity_wifi_remembered_groups_editor" >
         </activity>
         <activity
-            android:name="com.qualcomm.ftccommon.AboutActivity"
-            android:label="@string/about_activity" >
+            android:name="com.qualcomm.ftccommon.FtcAboutActivity"
+            android:label="@string/ftc_about_activity" >
         </activity>
         <activity
             android:name="com.qualcomm.ftccommon.configuration.EditSwapUsbDevices"
@@ -152,6 +150,12 @@
             android:label="@string/edit_lynx_usb_device_activity"
             android:windowSoftInputMode="stateHidden|adjustResize" >
         </activity>
+        <activity
+            android:name="com.qualcomm.ftccommon.configuration.EditWebcamActivity"
+            android:configChanges="orientation|screenSize"
+            android:label="@string/edit_webcam_activity"
+            android:windowSoftInputMode="stateHidden|adjustResize" >
+        </activity>
         <activity
             android:name="com.qualcomm.ftccommon.configuration.EditPWMDevicesActivity"
             android:configChanges="orientation|screenSize"

diff --git a/library/src/main/assets/RobotConfigTaxonomy.xml b/library/src/main/assets/RobotConfigTaxonomy.xml
@@ -126,4 +126,16 @@
 		<Bus>aobus</Bus>
 		<BusDefault>analog output port</BusDefault>
 	</Sensor>
+	<Sensor>
+		<XmlTag>RevRoboticsCoreHexMotor</XmlTag>
+		<Description>a REV Robotics Core Hex Motor</Description>
+		<Bus>nobus</Bus>
+		<BusDefault>port</BusDefault>
+	</Sensor>
+	<Sensor>
+		<XmlTag>LynxEmbeddedIMU</XmlTag>
+		<Description>the internal IMU</Description>
+		<Bus>i2cbus</Bus>
+		<BusDefault>port</BusDefault>
+	</Sensor>
 </RobotConfigTaxonomy>
diff --git a/library/src/main/java/com/qualcomm/ftccommon/AboutActivity.java b/library/src/main/java/com/qualcomm/ftccommon/AboutActivity.java
diff --git a/library/src/main/java/com/qualcomm/ftccommon/ClassManagerFactory.java b/library/src/main/java/com/qualcomm/ftccommon/ClassManagerFactory.java
@@ -32,7 +32,7 @@
 
 import com.qualcomm.ftccommon.configuration.RobotConfigFileManager;
 import com.qualcomm.ftccommon.configuration.RobotConfigResFilter;
-import com.qualcomm.robotcore.hardware.configuration.UserConfigurationTypeManager;
+import com.qualcomm.robotcore.hardware.configuration.ConfigurationTypeManager;
 
 import org.firstinspires.ftc.robotcore.external.Supplier;
 import org.firstinspires.ftc.robotcore.internal.opmode.AnnotatedOpModeClassFilter;
@@ -56,7 +56,7 @@ public static void registerFilters()
 
         ClassManager classManager = ClassManager.getInstance();
         classManager.registerFilter(AnnotatedOpModeClassFilter.getInstance());
-        classManager.registerFilter(UserConfigurationTypeManager.getInstance());
+        classManager.registerFilter(ConfigurationTypeManager.getInstance());
     }
 
     public static void registerResourceFilters()