From 7fa3da47a7bc1bc75384ee086d5301ba33664cd0 Mon Sep 17 00:00:00 2001
From: oradkovsky <oradkovsky@users.noreply.github.com>
Date: Mon, 26 Jul 2021 08:01:56 +0300
Subject: [PATCH] Update hamcrest to support espresso 3 4 0 (#115)

---
 android/build.gradle       |  2 +-
 androidsample/build.gradle | 18 +++++++++---------
 build.gradle               |  9 +++++----
 core/build.gradle          |  4 ++--
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 0e143e7..18ee709 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -42,7 +42,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    testImplementation 'junit:junit:4.13'
+    testImplementation "junit:junit:$junitVersion"
     api(project(':core'))
 
     implementation "androidx.test:rules:${androidXTestVersion}"
diff --git a/androidsample/build.gradle b/androidsample/build.gradle
index 4dbd995..a40232b 100644
--- a/androidsample/build.gradle
+++ b/androidsample/build.gradle
@@ -57,19 +57,19 @@ configurations.all {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation "com.google.android.material:material:1.1.0"
+    implementation "androidx.appcompat:appcompat:1.3.1"
+    implementation "com.google.android.material:material:1.4.0"
     //noinspection AnnotationProcessorOnCompilePath
     implementation "com.jakewharton:butterknife:$butterKnifeVersion"
     annotationProcessor "com.jakewharton:butterknife-compiler:$butterKnifeVersion"
     implementation "com.google.dagger:dagger:$daggerVersion"
     annotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
-    implementation "com.squareup.retrofit2:retrofit:2.7.2"
-    implementation "com.squareup.retrofit2:converter-gson:2.7.2"
+    implementation "com.squareup.retrofit2:retrofit:2.9.0"
+    implementation "com.squareup.retrofit2:converter-gson:2.9.0"
     implementation "com.squareup.okhttp3:logging-interceptor:$okHttpVersion"
     implementation "com.squareup.okhttp3:okhttp:$okHttpVersion"
 
-    implementation "com.google.code.gson:gson:2.8.5"
+    implementation "com.google.code.gson:gson:2.8.6"
     implementation "com.google.code.findbugs:annotations:2.0.3"
     compileOnly "javax.annotation:jsr250-api:1.0"
 
@@ -81,14 +81,14 @@ dependencies {
 
     //this dependency tends to break things for most users. Im adding it to check whether the app compiles correctly
     androidTestImplementation("androidx.test.espresso:espresso-contrib:$espressoVersion")
-    androidTestImplementation "androidx.annotation:annotation:1.1.0"
+    androidTestImplementation "androidx.annotation:annotation:1.2.0"
 
     //the most important, RESTMock! :)
     androidTestImplementation project(":android")
 
-    testImplementation "androidx.appcompat:appcompat:1.1.0"
-    testImplementation "com.google.android.material:material:1.1.0"
-    testImplementation "junit:junit:4.13"
+    testImplementation "androidx.appcompat:appcompat:1.3.1"
+    testImplementation "com.google.android.material:material:1.4.0"
+    testImplementation "junit:junit:$junitVersion"
     testImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
     testImplementation("androidx.test.espresso:espresso-contrib:$espressoVersion")
     testImplementation project(":android")
diff --git a/build.gradle b/build.gradle
index e845b61..41347bf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,15 +27,16 @@ buildscript {
 }
 
 ext {
-    libraryVersion = "0.4.3"
+    libraryVersion = "0.4.4"
     compileSdk = 29
     targetSdk = 29
     minSdk = 21
     buildTools = "29.0.2"
-    okHttpVersion = "4.6.0"
+    okHttpVersion = "4.9.1"
     butterKnifeVersion = "10.2.1"
-    espressoVersion = "3.1.0"
-    androidXTestVersion = "1.2.0"
+    espressoVersion = "3.4.0"
+    junitVersion = "4.13.2"
+    androidXTestVersion = "1.4.0"
     daggerVersion = "2.27"
 }
 
diff --git a/core/build.gradle b/core/build.gradle
index c528959..4ecb986 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -42,9 +42,9 @@ dependencies {
     compile fileTree(dir: "libs", include: ["*.jar"])
     compile "com.squareup.okhttp3:mockwebserver:${okHttpVersion}"
     compile "com.squareup.okhttp3:okhttp-tls:${okHttpVersion}"
-    compile "org.hamcrest:hamcrest-core:1.3"
+    compile "org.hamcrest:hamcrest-core:2.2"
 
-    testCompile "junit:junit:4.12"
+    testCompile "junit:junit:$junitVersion"
     testCompile "org.mockito:mockito-all:1.9.5"
     testCompile "com.squareup.okhttp3:okhttp:${okHttpVersion}"
     testCompile "com.google.code.findbugs:annotations:2.0.3"