Merge pull request #627 from googlesamples/todo-mvp-kotlin_dexmaker

Fixes dexmaker version
android · Jan 29, 2019 · cb7a41a · cb7a41a
2 parents eede124 + fd5d72d
commit cb7a41a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/todoapp/app/build.gradle b/todoapp/app/build.gradle
@@ -85,8 +85,7 @@ dependencies {
     // Dependencies for Android unit tests
     androidTestImplementation "junit:junit:$junitVersion"
     androidTestImplementation "org.mockito:mockito-core:$mockitoVersion"
-    androidTestImplementation "com.google.dexmaker:dexmaker:$dexMaker"
-    androidTestImplementation "com.google.dexmaker:dexmaker-mockito:$dexMaker"
+    androidTestImplementation "com.linkedin.dexmaker:dexmaker-mockito:$dexMakerVersion"
 
     // Android Testing Support Library - Instrumented testing
     androidTestImplementation "androidx.test:runner:$androidXTestVersion"

diff --git a/todoapp/build.gradle b/todoapp/build.gradle
@@ -45,7 +45,7 @@ ext {
     guavaVersion = '27.0.1-android'
     junitVersion = '4.12'
     mockitoVersion = '2.8.9'
-    dexMaker = '1.2'
+    dexMakerVersion = '2.12.1'
     hamcrestVersion = '1.3'
     runnerVersion = '1.0.1'
     rulesVersion = '1.0.1'