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

Unverified Commit 3887681d authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #5759 from k9mail/updates

Update all the things
parents 15309e3f 3de500fc
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ dependencies {
    testImplementation "com.google.truth:truth:${versions.truth}"
    testImplementation "org.mockito:mockito-core:${versions.mockito}"
    testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
    testImplementation "org.koin:koin-test:${versions.koin}"
    testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"
}

android {
+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ dependencies {
    testImplementation "com.google.truth:truth:${versions.truth}"
    testImplementation "org.mockito:mockito-core:${versions.mockito}"
    testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
    testImplementation "org.koin:koin-test:${versions.koin}"
    testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"
}

android {
+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ dependencies {
    testImplementation "com.google.truth:truth:${versions.truth}"
    testImplementation "org.mockito:mockito-core:${versions.mockito}"
    testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
    testImplementation "org.koin:koin-test:${versions.koin}"
    testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"
}

android {
+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ dependencies {

    implementation project(':plugins:openpgp-api-lib:openpgp-api')

    api "org.koin:koin-androidx-viewmodel:${versions.koin}"
    api "io.insert-koin:koin-android:${versions.koin}"

    api "androidx.annotation:annotation:${versions.androidxAnnotation}"

@@ -37,7 +37,7 @@ dependencies {
    testImplementation "org.mockito:mockito-core:${versions.mockito}"
    testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
    testImplementation "org.jdom:jdom2:2.0.6"
    testImplementation "org.koin:koin-test:${versions.koin}"
    testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"
}

android {
+13 −3
Original line number Diff line number Diff line
@@ -7,11 +7,21 @@
    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />

    <application>

        <provider
            android:name="androidx.work.impl.WorkManagerInitializer"
            android:authorities="${applicationId}.workmanager-init"
            android:name="androidx.startup.InitializationProvider"
            android:authorities="${applicationId}.androidx-startup"
            android:exported="false"
            tools:node="merge">

            <!-- We initialize WorkManager manually -->
            <meta-data
                android:name="androidx.work.WorkManagerInitializer"
                android:value="androidx.startup"
                tools:node="remove" />

        </provider>

    </application>

</manifest>
Loading