Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 04010db4 authored by David Luhmer's avatar David Luhmer Committed by GitHub
Browse files

Merge pull request #54 from Unpublished/mockito 

Bump mockito to 2.27.0 and fix up merge conflict
parents d83ce49d 5ef4eaf7

build.gradle

+1 −2
Original line number Original line Diff line number Diff line
@@ -51,7 +51,6 @@ android { 
}

}





dependencies {

dependencies {

    implementation 'androidx.legacy:legacy-support-v4:1.0.0'

    implementation "androidx.appcompat:appcompat:1.0.2"

    implementation "androidx.appcompat:appcompat:1.0.2"

    implementation 'androidx.annotation:annotation:1.0.2'

    implementation 'androidx.annotation:annotation:1.0.2'

    implementation 'androidx.core:core:1.0.1'

    implementation 'androidx.core:core:1.0.1'
@@ -72,5 +71,5 @@ dependencies { 
    // Required for local unit tests (JUnit 4 framework)

    // Required for local unit tests (JUnit 4 framework)

    testImplementation 'junit:junit:4.12'

    testImplementation 'junit:junit:4.12'

    // required if you want to use Mockito for unit tests

    // required if you want to use Mockito for unit tests

    testImplementation 'org.mockito:mockito-core:2.26.0'

    testImplementation 'org.mockito:mockito-core:2.27.0'

}
 
}