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

Unverified Commit b752a00b authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé Committed by GitHub
Browse files

Merge pull request #9179 from wmontwe/add-kotlin-multiplatform-support 

Add Kotlin Multiplatform support
parents da8cbbe5 f3436f09

app-common/build.gradle.kts

+2 −3
Original line number Diff line number Diff line
@@ -17,12 +17,11 @@ dependencies { 
    implementation(projects.legacy.core)

    implementation(projects.core.android.account)



    implementation(projects.core.account)



    implementation(projects.core.featureflags)

    implementation(projects.core.featureflag)

    implementation(projects.core.ui.legacy.theme2.common)



    implementation(projects.feature.account.setup)

    implementation(projects.feature.mail.account.api)

    implementation(projects.feature.migration.provider)

    implementation(projects.feature.widget.messageList)

app-common/src/main/kotlin/net/thunderbird/app/common/account/AccountCreator.kt

+2 −2
Original line number Diff line number Diff line 
package net.thunderbird.app.common.account



import android.content.Context

import app.k9mail.core.common.mail.Protocols

import app.k9mail.feature.account.common.domain.entity.Account

import app.k9mail.feature.account.common.domain.entity.SpecialFolderOption

import app.k9mail.feature.account.common.domain.entity.SpecialFolderSettings
@@ -24,7 +23,8 @@ import kotlinx.coroutines.CoroutineDispatcher 
import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.withContext

import net.thunderbird.core.android.account.LegacyAccount

import net.thunderbird.core.mail.folder.api.SpecialFolderSelection

import net.thunderbird.core.common.mail.Protocols

import net.thunderbird.feature.mail.folder.api.SpecialFolderSelection



// TODO Move to feature/account/setup

internal class AccountCreator(

app-common/src/main/kotlin/net/thunderbird/app/common/account/CommonAccountDefaultsProvider.kt

+3 −3
Original line number Diff line number Diff line 
package net.thunderbird.app.common.account



import app.k9mail.core.featureflag.FeatureFlagProvider

import app.k9mail.core.featureflag.toFeatureFlagKey

import com.fsck.k9.CoreResourceProvider

import com.fsck.k9.K9

import net.thunderbird.core.android.account.AccountDefaultsProvider
@@ -26,8 +24,10 @@ import net.thunderbird.core.android.account.FolderMode 
import net.thunderbird.core.android.account.Identity

import net.thunderbird.core.android.account.LegacyAccount

import net.thunderbird.core.android.account.ShowPictures

import net.thunderbird.core.mail.folder.api.SpecialFolderSelection

import net.thunderbird.core.featureflag.FeatureFlagProvider

import net.thunderbird.core.featureflag.toFeatureFlagKey

import net.thunderbird.core.preferences.Storage

import net.thunderbird.feature.mail.folder.api.SpecialFolderSelection

import net.thunderbird.feature.notification.NotificationLight

import net.thunderbird.feature.notification.NotificationSettings

import net.thunderbird.feature.notification.NotificationVibration

app-common/src/test/kotlin/net/thunderbird/app/common/account/CommonAccountDefaultsProviderTest.kt

+2 −2
Original line number Diff line number Diff line 
package net.thunderbird.app.common.account



import app.k9mail.core.featureflag.FeatureFlagResult

import assertk.assertThat

import assertk.assertions.isEqualTo

import assertk.assertions.isFalse
@@ -29,8 +28,9 @@ import net.thunderbird.core.android.account.FolderMode 
import net.thunderbird.core.android.account.Identity

import net.thunderbird.core.android.account.LegacyAccount

import net.thunderbird.core.android.account.ShowPictures

import net.thunderbird.core.mail.folder.api.SpecialFolderSelection

import net.thunderbird.core.featureflag.FeatureFlagResult

import net.thunderbird.core.preferences.Storage

import net.thunderbird.feature.mail.folder.api.SpecialFolderSelection

import net.thunderbird.feature.notification.NotificationLight

import net.thunderbird.feature.notification.NotificationSettings

import net.thunderbird.feature.notification.NotificationVibration

app-k9mail/build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ dependencies { 
    implementation(projects.legacy.core)

    implementation(projects.legacy.ui.legacy)



    implementation(projects.core.featureflags)

    implementation(projects.core.featureflag)



    implementation(projects.feature.account.settings.impl)