Skip to content

Commit

Permalink
Update hamcrest to support espresso 3 4 0 (#115)
Browse files Browse the repository at this point in the history
  • Loading branch information
oradkovsky authored Jul 26, 2021
1 parent fec3d92 commit 7fa3da4
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
18 changes: 9 additions & 9 deletions androidsample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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")
Expand Down
9 changes: 5 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down
4 changes: 2 additions & 2 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 7fa3da4

Please sign in to comment.