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

Commit f54c44a1 authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Merge remote-tracking branch 'origin/master'

parents a7036c36 f2b37df2
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ dependencies {
    implementation 'io.reactivex.rxjava2:rxjava:2.2.21'

    // Testing
    testImplementation 'androidx.test:core:1.3.0'
    testImplementation 'androidx.test:core:1.4.0'
    testImplementation 'androidx.arch.core:core-testing:2.1.0'
    testImplementation 'junit:junit:4.13.2'
    testImplementation 'org.mockito:mockito-core:3.11.2'
+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ buildscript {
    }
    dependencies {
        apply plugin: 'maven'
        classpath 'com.android.tools.build:gradle:4.2.1'
        classpath 'com.android.tools.build:gradle:4.2.2'

        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ dependencies {

    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'

    testImplementation 'androidx.test:core:1.3.0'
    testImplementation 'androidx.test:core:1.4.0'
    testImplementation 'androidx.arch.core:core-testing:2.1.0'
    testImplementation 'junit:junit:4.13.2'
    testImplementation 'org.mockito:mockito-core:3.11.2'