Merge pull request odk-x#183 from odk-x/demo

release 2.1.7

Author: linl33

androidlibrary_lib/build.gradle

@@ -104,15 +104,15 @@ dependencies {
     implementation 'net.jcip:jcip-annotations:1.0'
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.preference:preference:1.1.0'
-    implementation 'androidx.fragment:fragment:1.2.0-rc04'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.fragment:fragment:1.3.0-beta01'
 
     // Testing dependencies
     testImplementation 'junit:junit:4.12'
     testImplementation 'androidx.annotation:annotation:1.1.0'
-    androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
 
 }
 

androidlibrary_lib/libs/commons-io-2.5.jar

@@ -17,9 +17,12 @@
 
 import android.net.Uri;
 import android.os.Environment;
-import androidx.annotation.CheckResult;
 import android.util.Log;
+
+import androidx.annotation.CheckResult;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.IOFileFilter;
 import org.apache.commons.lang3.CharEncoding;

androidlibrary_lib/libs/commons-lang3-3.5.jar

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.9.8"
     }
 }

androidlibrary_lib/libs/commons-lang3-3.8.1.jar

@@ -1,6 +1,6 @@
-#Tue Mar 12 18:59:00 PDT 2019
+#Thu Oct 29 13:19:59 PDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

androidlibrary_lib/libs/jackson-annotations-2.10.1.jar

@@ -1,4 +1,4 @@
-gradle.ext.gradleConfigVersion = 141
+gradle.ext.gradleConfigVersion = 146
 
 if ( !gradle.ext.has('workspacePath') ) {
 	def env = System.getProperties();