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

Commit 26b3ac20 authored by Fahim's avatar Fahim
Browse files

Merge branch 'upstream/update' into 4074-update_with_latest_upstream_release

parents 7dff2b6a b165aeaf

.github/workflows/android.yml

+1 −1
Original line number Diff line number Diff line
@@ -13,4 +13,4 @@ jobs: 
      with:

        java-version: 11

    - name: Build with Gradle

      run: ./gradlew assembleDebug testDebugUnitTest ktlintCheck
 
      run: ./gradlew assembleDebug ktlintCheck testsOnCi

app/autodiscovery/providersxml/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ dependencies { 
    testImplementation "androidx.test:core:${versions.androidxTestCore}"

    testImplementation "junit:junit:${versions.junit}"

    testImplementation "com.google.truth:truth:${versions.truth}"

    testImplementation "org.mockito:mockito-core:${versions.mockito}"

    testImplementation "org.mockito:mockito-inline:${versions.mockito}"

    testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"

    testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"

}

app/autodiscovery/providersxml/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
mock-maker-inline

app/autodiscovery/srvrecords/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ dependencies { 
    testImplementation "androidx.test:core:${versions.androidxTestCore}"

    testImplementation "junit:junit:${versions.junit}"

    testImplementation "com.google.truth:truth:${versions.truth}"

    testImplementation "org.mockito:mockito-core:${versions.mockito}"

    testImplementation "org.mockito:mockito-inline:${versions.mockito}"

    testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"

    testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"

}

app/autodiscovery/srvrecords/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
mock-maker-inline