Move StoragePersister implementation to :app:storage module

app/core/src/main/java/com/fsck/k9/KoinModule.kt

@@ -10,15 +10,12 @@ import com.fsck.k9.mail.ssl.TrustedSocketFactory
 import com.fsck.k9.mailstore.LocalStoreProvider
 import com.fsck.k9.mailstore.StorageManager
 import com.fsck.k9.power.TracingPowerManager
-import com.fsck.k9.preferences.K9StoragePersister
-import com.fsck.k9.preferences.StoragePersister
 import org.koin.dsl.module.applicationContext
 
 val mainModule = applicationContext {
     bean { Preferences.getPreferences(get()) }
     bean { get<Context>().resources }
     bean { StorageManager.getInstance(get()) }
-    bean { K9StoragePersister(get()) as StoragePersister }
     bean { LocalStoreProvider() }
     bean { TracingPowerManager.getPowerManager(get()) as PowerManager }
     bean { Contacts.getInstance(get()) }

app/k9mail/src/main/java/com/fsck/k9/Dependencies.kt

@@ -7,6 +7,8 @@ import com.fsck.k9.crypto.openpgp.OpenPgpEncryptionExtractor
 import com.fsck.k9.external.BroadcastSenderListener
 import com.fsck.k9.external.externalModule
 import com.fsck.k9.notification.notificationModule
+import com.fsck.k9.preferences.K9StoragePersister
+import com.fsck.k9.preferences.StoragePersister
 import com.fsck.k9.resources.resourcesModule
 import com.fsck.k9.storage.storageModule
 import com.fsck.k9.widget.list.MessageListWidgetUpdateListener
@@ -26,6 +28,7 @@ private val mainAppModule = applicationContext {
     }
     bean("controllerExtensions") { emptyList<ControllerExtension>() }
     bean { OpenPgpEncryptionExtractor.newInstance() as EncryptionExtractor }
+    bean { K9StoragePersister(get()) as StoragePersister }
 }
 
 val appModules = listOf(