Merge branch 'master' into update-to-5.2

build.gradle

@@ -19,9 +19,7 @@ allprojects {
  google()
  jcenter()
  maven { url 'https://jitpack.io' }
- maven {
- url "https://raw.githubusercontent.com/Pattonville-Robotics/ftc-lib-repo/mvn-repo/"
- }
+ maven { url "https://raw.githubusercontent.com/Pattonville-Robotics/ftc-lib-repo/mvn-repo/" }
  }
 }
 

gradle.properties

@@ -9,7 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+# Explicit encoding required for sources with special chars to build on Windows
+org.gradle.jvmargs=-Xmx1536m -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

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-5.4.1-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-5.4.1-all.zip

library/build.gradle

@@ -2,9 +2,11 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
 android {
- compileSdkVersion 27
+ compileSdkVersion 28
  defaultConfig {
  minSdkVersion 19
+ // Required to bypass runtime Camera permissions
+ //noinspection ExpiredTargetSdkVersion
  targetSdkVersion 19
  versionCode 13
  versionName "5.2.0"
@@ -27,21 +29,22 @@ android {
  }
 }
 
-group = 'com.github.Pattonville-Robotics'
+group = 'com.github.modular-ftc'
 version = android.defaultConfig.versionName
 project.archivesBaseName = 'robotcore-repackaged'
 
 dependencies {
- implementation 'com.android.support:support-annotations:28.0.0'
-
- implementation 'com.github.modular-ftc:vuforia-repackaged:5.2.0'
-
+ // Original dependencies
  implementation "org.first.ftc:tensorflow-lite:5.2"
  implementation "org.first.ftc:tfod:5.2"
 
+ // Repackaged dependencies
+ 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'
@@ -58,6 +61,7 @@ task sourcesJar(type: Jar) {
 
 task javadoc(type: Javadoc) {
  failOnError false
+ options.encoding 'UTF-8'
  source = android.sourceSets.main.java.sourceFiles
  classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
  classpath += configurations.compile

library/src/main/java/com/qualcomm/robotcore/util/ClassUtil.java

@@ -292,7 +292,7 @@ protected static Class findClass(String className)
  protected static class MappedByteBufferInfo
  {
  public static Field blockField = getDeclaredField(java.nio.MappedByteBuffer.class, "block");
- public static Field addressField = getDeclaredField(blockField.getType(), "address");
+ public static Field addressField = getDeclaredField(blockField != null ? blockField.getType() : Object.class, "address");
  }
 
  public static long memoryAddressFrom(MappedByteBuffer buffer)

to-check-for-modification.md

@@ -0,0 +1,7 @@
+Files modified:
+
+- `src/main/java/com/qualcomm/robotcore/util/ClassUtil.java`
+- `src/main/java/com/qualcomm/robotcore/hardware/usb/RobotUsbDeviceImplBase.java`
+- `src/main/java/com/qualcomm/robotcore/hardware/configuration/Utility.java`
+- `src/main/java/org/firstinspires/ftc/robotcore/external/navigation/Orientation.java`
+- `src/main/java/org/firstinspires/ftc/robotcore/internal/opmode/TelemetryImpl.java`