Update dependencies

build.gradle

@@ -6,20 +6,20 @@ buildscript {
     ]
     ext.versions = [
         'architectureComponents': [
-            'lifecycle': '2.1.0-alpha02',
-            'room': '2.1.0-alpha04'
+            'lifecycle': '2.1.0-alpha03',
+            'room': '2.1.0-alpha06'
         ],
         'grpc':'1.19.0',
         'kotlin': '1.3.21',
         'coroutines': '1.1.1',
-        'junitJupiter': '5.4.0'
+        'junitJupiter': '5.5.0-M1'
     ]
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0-alpha07'
+        classpath 'com.android.tools.build:gradle:3.5.0-alpha09'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "org.jetbrains.kotlin:kotlin-allopen:${versions.kotlin}"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.21.0"
@@ -49,24 +49,48 @@ repositories {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion buildConfig.compileSdkVersion
+
+    useLibrary 'android.test.runner'
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 28
-        versionCode = 1_07_04_00  // last digits are alpha(0X) beta(1X) rc(2X) release(3X). Ex: 1_08_04_20 is a RC build
+        minSdkVersion buildConfig.minSdkVersion
+        targetSdkVersion buildConfig.targetSdkVersion
+        versionCode = 1_07_05_00  // last digits are alpha(0X) beta(1X) rc(2X) release(3X). Ex: 1_08_04_20 is a RC build
         versionName = "$version-alpha"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        multiDexEnabled false
+        testInstrumentationRunnerArguments clearPackageData: 'true'
+        multiDexEnabled true
         archivesBaseName = "zcash-android-wallet-sdk-$versionName"
     }
 
     buildTypes {
+        debug {
+            // for test builds, which exceed the dex limit because they pull in things like mockito and grpc-testing
+            multiDexEnabled true
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
+        }
         release {
-            minifyEnabled false
+            multiDexEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
         }
     }
+
+    flavorDimensions 'network'
+
+    productFlavors {
+        // would rather name them "testnet" and "mainnet" but product flavor names cannot start with the word "test"
+        zcashtestnet {
+            dimension 'network'
+        }
+
+        zcashmainnet {
+            dimension 'network'
+        }
+    }
+
     sourceSets {
         main {
             java {
@@ -106,7 +130,7 @@ clean {
 
 protobuf {
     generatedFilesBaseDir = "$projectDir/src/generated/source/grpc"
-    protoc { artifact = 'com.google.protobuf:protoc:3.7.0' }
+    protoc { artifact = 'com.google.protobuf:protoc:3.7.1' }
     plugins {
         javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
         grpc { artifact = "io.grpc:protoc-gen-grpc-java:${versions.grpc}" }
@@ -116,15 +140,15 @@ protobuf {
             task.plugins {
                 javalite {}
                 grpc { // Options added to --grpc_out
-                    option 'lite' }
+                    option 'lite'
+                }
             }
         }
     }
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.1.0-alpha02'
-    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha03'
 
     // Architecture Components: Lifecycle
     implementation "androidx.lifecycle:lifecycle-runtime:${versions.architectureComponents.lifecycle}"
@@ -146,13 +170,17 @@ dependencies {
     implementation "io.grpc:grpc-protobuf-lite:${versions.grpc}"
     implementation "io.grpc:grpc-stub:${versions.grpc}"
     implementation 'javax.annotation:javax.annotation-api:1.3.2'
+    // solves error: Duplicate class com.google.common.util.concurrent.ListenableFuture found in modules jetified-guava-26.0-android.jar (com.google.guava:guava:26.0-android) and listenablefuture-1.0.jar (com.google.guava:listenablefuture:1.0)
+    // per this recommendation from Chris Povirk, given guava's decision to split ListenableFuture away from Guava: https://groups.google.com/d/msg/guava-discuss/GghaKwusjcY/bCIAKfzOEwAJ
+    implementation 'com.google.guava:guava:27.0.1-android'
 
     // Other
     implementation "com.jakewharton.timber:timber:4.7.1"
 
     // Tests
+    testImplementation 'androidx.multidex:multidex:2.0.1'
     testImplementation "org.jetbrains.kotlin:kotlin-reflect:${versions.kotlin}"
-    testImplementation 'org.mockito:mockito-junit-jupiter:2.25.0'
+    testImplementation 'org.mockito:mockito-junit-jupiter:2.25.1'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
     testImplementation "org.junit.jupiter:junit-jupiter-api:${versions.junitJupiter}"
     testImplementation "org.junit.jupiter:junit-jupiter-engine:${versions.junitJupiter}"
@@ -164,11 +192,12 @@ dependencies {
     // was buggy, crashing in several places. It also would require a separate test flavor because it's minimum API 26
     // because "JUnit 5 uses Java 8-specific APIs that didn't exist on Android before the Oreo release."
     androidTestImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
-    androidTestImplementation 'org.mockito:mockito-android:2.25.0'
+    androidTestImplementation 'org.mockito:mockito-android:2.25.1'
     androidTestImplementation "androidx.test:runner:1.1.2-alpha02"
     androidTestImplementation "androidx.test:core:1.1.1-alpha02"
-    androidTestImplementation "androidx.arch.core:core-testing:2.0.0"
+    androidTestImplementation "androidx.arch.core:core-testing:2.0.1"
     androidTestImplementation 'androidx.test.ext:junit:1.1.1-alpha02'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
 }
 
 

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

src/main/AndroidManifest.xml

@@ -1,6 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="cash.z.wallet.sdk">
-    <!--<application-->
-            <!--android:name="androidx.multidex.MultiDexApplication" />-->
     <uses-permission android:name="android.permission.INTERNET" />
 </manifest>