Update Gradle, project dependencies, and SDK versions. (#110)

9 files changed, 40 insertions, 40 deletions

diff --git a/build.gradle b/build.gradle
index 6f34b83..2016b80 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.5.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/examples/ex1_standalone_app/build.gradle b/examples/ex1_standalone_app/build.gradle
index eed268a..6dc66e3 100644
--- a/examples/ex1_standalone_app/build.gradle
+++ b/examples/ex1_standalone_app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.google.android.mobly.snippet.example1"
-        minSdkVersion 15
-        targetSdkVersion 26
+        minSdkVersion 26
+        targetSdkVersion 31
         versionCode 1
         versionName "0.0.1"
     }
diff --git a/examples/ex2_espresso/build.gradle b/examples/ex2_espresso/build.gradle
index 9caf136..e94c7f7 100644
--- a/examples/ex2_espresso/build.gradle
+++ b/examples/ex2_espresso/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
     flavorDimensions "examples"
 
     defaultConfig {
         applicationId "com.google.android.mobly.snippet.example2"
-        minSdkVersion 15
-        targetSdkVersion 26
+        minSdkVersion 26
+        targetSdkVersion 31
         versionCode 1
         versionName "0.0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -32,15 +32,15 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
-    implementation 'androidx.test:runner:1.1.1'
+    implementation 'androidx.appcompat:appcompat:1.4.0-beta01'
+    implementation 'androidx.test:runner:1.4.0'
 
     // The androidTest package is not for snippet support; it shows an example
     // of an instrumentation test coexisting with a snippet in the same
     // codebase.
-    androidTestImplementation 'androidx.annotation:annotation:1.0.1'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1', {
+    androidTestImplementation 'androidx.annotation:annotation:1.2.0'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.4.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 
@@ -50,7 +50,7 @@ dependencies {
     //snippetCompile 'com.google.android.mobly:mobly-snippet-lib:1.3.0'
     snippetImplementation project(':mobly-snippet-lib')
 
-    snippetImplementation 'androidx.annotation:annotation:1.0.1'
-    snippetImplementation 'androidx.test:rules:1.1.1'
-    snippetImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    snippetImplementation 'androidx.annotation:annotation:1.2.0'
+    snippetImplementation 'androidx.test:rules:1.4.0'
+    snippetImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
diff --git a/examples/ex3_async_event/build.gradle b/examples/ex3_async_event/build.gradle
index 24e6dff..0b82e23 100644
--- a/examples/ex3_async_event/build.gradle
+++ b/examples/ex3_async_event/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.google.android.mobly.snippet.example3"
-        minSdkVersion 15
-        targetSdkVersion 26
+        minSdkVersion 26
+        targetSdkVersion 31
         versionCode 1
         versionName "0.0.1"
     }
diff --git a/examples/ex4_uiautomator/build.gradle b/examples/ex4_uiautomator/build.gradle
index 9b4bbe6..028d580 100644
--- a/examples/ex4_uiautomator/build.gradle
+++ b/examples/ex4_uiautomator/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 
 android {
     // This has to match what the appcompat dep expects.
-    compileSdkVersion 28
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.google.android.mobly.snippet.example4"
-        minSdkVersion 18
-        targetSdkVersion 26
+        minSdkVersion 26
+        targetSdkVersion 31
         versionCode 1
         versionName "0.0.2"
     }
@@ -25,8 +25,8 @@ dependencies {
     // 'compile' dep instead:
     //compile 'com.google.android.mobly:mobly-snippet-lib:1.3.0'
     implementation project(':mobly-snippet-lib')
-    implementation 'junit:junit:4.12'
-    implementation 'androidx.test:runner:1.1.1'
-    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
+    implementation 'junit:junit:4.13.2'
+    implementation 'androidx.test:runner:1.4.0'
+    implementation 'androidx.appcompat:appcompat:1.4.0-beta01'
     implementation 'androidx.test.uiautomator:uiautomator:2.2.0'
 }
diff --git a/examples/ex5_schedule_rpc/build.gradle b/examples/ex5_schedule_rpc/build.gradle
index 372195d..e948355 100644
--- a/examples/ex5_schedule_rpc/build.gradle
+++ b/examples/ex5_schedule_rpc/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.google.android.mobly.snippet.example5"
-        minSdkVersion 15
-        targetSdkVersion 26
+        minSdkVersion 26
+        targetSdkVersion 31
         versionCode 1
         versionName "0.0.1"
     }
@@ -23,5 +23,5 @@ dependencies {
     // this repo. For your own snippets, you'll want to use the regular 'compile' dep instead:
     // compile 'com.google.android.mobly:mobly-snippet-lib:1.3.0'
     implementation project(':mobly-snippet-lib')
-    implementation 'androidx.test:runner:1.1.1'
+    implementation 'androidx.test:runner:1.4.0'
 }
diff --git a/examples/ex6_complex_type_conversion/build.gradle b/examples/ex6_complex_type_conversion/build.gradle
index af05a85..45110b2 100644
--- a/examples/ex6_complex_type_conversion/build.gradle
+++ b/examples/ex6_complex_type_conversion/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 31
+    buildToolsVersion '31.0.0'
 
     defaultConfig {
         applicationId "com.google.android.mobly.snippet.example6"
-        minSdkVersion 16
-        targetSdkVersion 26
+        minSdkVersion 26
+        targetSdkVersion 31
         versionCode 1
         versionName "0.0.1"
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 74643ca..f90e9f5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jan 28 16:01:11 PST 2019
+#Thu Sep 30 15:55:27 PDT 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/third_party/sl4a/build.gradle b/third_party/sl4a/build.gradle
index be3672f..a211d3a 100644
--- a/third_party/sl4a/build.gradle
+++ b/third_party/sl4a/build.gradle
@@ -20,11 +20,11 @@ apply plugin: 'com.jfrog.bintray'
 
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
 
     defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 26
+        minSdkVersion 26
+        targetSdkVersion 31
         versionCode VERSION_CODE.toInteger()
         versionName VERSION_NAME
 
@@ -60,8 +60,8 @@ android {
 dependencies {
     // implementation fileTree(include: ['*.jar'], dir: 'libs')
     // implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'junit:junit:4.12'
-    implementation 'androidx.test:runner:1.1.1'
+    implementation 'junit:junit:4.13.2'
+    implementation 'androidx.test:runner:1.4.0'
 }
 
 googleJavaFormat {