From 22425d756e9419375efae3185ad5953a7c43fc7e Mon Sep 17 00:00:00 2001
From: Kevin Gorham <kevin.gorham@electriccoin.co>
Date: Fri, 9 Apr 2021 22:05:33 -0400
Subject: [PATCH] Update project dependencies.

---
 build.gradle                                         | 12 ++++++------
 config.gradle                                        |  7 ++++---
 src/main/java/cash/z/ecc/android/sdk/ext/ZcashSdk.kt |  2 --
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2413a802..e997baa7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -187,11 +187,10 @@ cargo {
 
 dependencies {
 
-    implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
+    implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
 
     // Architecture Components: Lifecycle
-    implementation "androidx.lifecycle:lifecycle-runtime:${config.versions.architectureComponents.lifecycle}"
-    implementation "androidx.lifecycle:lifecycle-extensions:${config.versions.architectureComponents.lifecycle}"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:${config.versions.architectureComponents.lifecycle}"
     implementation "androidx.lifecycle:lifecycle-common-java8:${config.versions.architectureComponents.lifecycle}"
 
     // Architecture Components: Room
@@ -223,8 +222,8 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.6'
     // OKIO is a transitive dependency used when writing param files to disk. Like GSON, this can be
     // replaced if needed. For compatibility, we match the library version used in grpc-okhttp:
-    // https://github.com/grpc/grpc-java/blob/v1.34.x/build.gradle#L154
-    implementation 'com.squareup.okio:okio:1.13.0'
+    // https://github.com/grpc/grpc-java/blob/v1.37.x/build.gradle#L159
+    implementation 'com.squareup.okio:okio:1.17.5'
 
     // Tests
     testImplementation 'androidx.multidex:multidex:2.0.1'
@@ -247,8 +246,9 @@ dependencies {
     androidTestImplementation "androidx.arch.core:core-testing:2.1.0"
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation "com.squareup.okhttp3:okhttp:3.8.0"
     androidTestImplementation 'ru.gildor.coroutines:kotlin-coroutines-okhttp:1.0'
+    // used by 'ru.gildor.coroutines.okhttp.await' (to make simple suspended requests) and breaks on versions higher than 3.8.0
+    androidTestImplementation "com.squareup.okhttp3:okhttp:3.8.0"
 
     // sample mnemonic plugin
     androidTestImplementation 'com.github.zcash:zcash-android-wallet-plugins:1.0.1'
diff --git a/config.gradle b/config.gradle
index e09d3770..fd7bd94f 100644
--- a/config.gradle
+++ b/config.gradle
@@ -7,13 +7,14 @@ compileSdkVersion = 30
 minSdkVersion = 16
 targetSdkVersion = 30
 
+// find stable version updates here: https://developer.android.com/jetpack/androidx/versions/stable-channel
 versions {
     architectureComponents {
-        lifecycle = '2.2.0'
-        room = '2.2.5'
+        lifecycle = '2.3.1'
+        room = '2.2.6'
         paging = '2.1.2'
     }
-    grpc = '1.34.1'
+    grpc = '1.37.0'
     coroutines = '1.4.2'
     junitJupiter = '5.6.1'
     kotlin = '1.4.31'
diff --git a/src/main/java/cash/z/ecc/android/sdk/ext/ZcashSdk.kt b/src/main/java/cash/z/ecc/android/sdk/ext/ZcashSdk.kt
index 52c04fcb..34130b78 100644
--- a/src/main/java/cash/z/ecc/android/sdk/ext/ZcashSdk.kt
+++ b/src/main/java/cash/z/ecc/android/sdk/ext/ZcashSdk.kt
@@ -1,7 +1,5 @@
 package cash.z.ecc.android.sdk.ext
 
-import cash.z.ecc.android.sdk.type.ZcashNetwork
-
 /**
  * Wrapper for all the constant values in the SDK. It is important that these values stay fixed for
  * all users of the SDK. Otherwise, if individual wallet makers are using different values, it