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

Unverified Commit 075e37e0 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #8367 from cketti/remove_migration_features_from_k9 

Limit account migration features to Thunderbird
parents 9785781d 9e1aa36a

app-k9mail/build.gradle.kts

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ dependencies { 
    implementation(projects.feature.telemetry.noop)

    implementation(projects.feature.funding.noop)

    implementation(projects.feature.onboarding.migration.noop)

    implementation(projects.feature.migration.launcher.noop)



    implementation(libs.androidx.work.runtime)

app-k9mail/dependencies/releaseRuntimeClasspath.txt

+0 −7
Original line number Diff line number Diff line
@@ -11,11 +11,6 @@ androidx.arch.core:core-runtime:2.2.0 
androidx.autofill:autofill:1.0.0

androidx.biometric:biometric:1.1.0

androidx.browser:browser:1.3.0

androidx.camera:camera-camera2:1.3.4

androidx.camera:camera-core:1.3.4

androidx.camera:camera-lifecycle:1.3.4

androidx.camera:camera-video:1.3.4

androidx.camera:camera-view:1.3.4

androidx.cardview:cardview:1.0.0

androidx.collection:collection-jvm:1.4.4

androidx.collection:collection-ktx:1.4.4
@@ -145,10 +140,8 @@ com.github.bumptech.glide:gifdecoder:4.16.0 
com.github.bumptech.glide:glide:4.16.0

com.google.android.flexbox:flexbox:3.0.0

com.google.android.material:material:1.12.0

com.google.auto.value:auto-value-annotations:1.6.3

com.google.errorprone:error_prone_annotations:2.15.0

com.google.guava:listenablefuture:1.0

com.google.zxing:core:3.5.3

com.jakewharton.timber:timber:5.0.1

com.jcraft:jzlib:1.0.7

com.mikepenz:fastadapter-extensions-drag:5.7.0

app-k9mail/src/main/kotlin/app/k9mail/K9KoinModule.kt

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ import app.k9mail.core.ui.theme.api.FeatureThemeProvider 
import app.k9mail.core.ui.theme.api.ThemeProvider

import app.k9mail.dev.developmentModuleAdditions

import app.k9mail.feature.funding.featureFundingModule

import app.k9mail.feature.migration.launcher.featureMigrationModule

import app.k9mail.feature.onboarding.migration.onboardingMigrationModule

import app.k9mail.feature.telemetry.telemetryModule

import app.k9mail.feature.widget.shortcut.LauncherShortcutActivity
@@ -32,6 +33,7 @@ val appModule = module { 
    includes(telemetryModule)

    includes(featureFundingModule)

    includes(onboardingMigrationModule)

    includes(featureMigrationModule)



    single(named("ClientInfoAppName")) { BuildConfig.CLIENT_INFO_APP_NAME }

    single(named("ClientInfoAppVersion")) { BuildConfig.VERSION_NAME }

app-thunderbird/build.gradle.kts

+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ dependencies { 
    fullReleaseImplementation(projects.feature.funding.googleplay)



    implementation(projects.feature.onboarding.migration.thunderbird)

    implementation(projects.feature.migration.launcher.thunderbird)



    testImplementation(libs.robolectric)

app-thunderbird/src/main/kotlin/net/thunderbird/android/ThunderbirdKoinModule.kt

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ import app.k9mail.core.featureflag.FeatureFlagFactory 
import app.k9mail.core.ui.theme.api.FeatureThemeProvider

import app.k9mail.core.ui.theme.api.ThemeProvider

import app.k9mail.feature.funding.featureFundingModule

import app.k9mail.feature.migration.launcher.featureMigrationModule

import app.k9mail.feature.onboarding.migration.onboardingMigrationModule

import app.k9mail.feature.telemetry.telemetryModule

import app.k9mail.feature.widget.shortcut.LauncherShortcutActivity
@@ -31,6 +32,7 @@ val appModule = module { 
    includes(telemetryModule)

    includes(featureFundingModule)

    includes(onboardingMigrationModule)

    includes(featureMigrationModule)



    single(named("ClientInfoAppName")) { BuildConfig.CLIENT_INFO_APP_NAME }

    single(named("ClientInfoAppVersion")) { BuildConfig.VERSION_NAME }