diff options
| author | Albin <albin@mullvad.net> | 2023-06-07 14:56:42 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-06-07 14:56:42 +0200 |
| commit | 4ce0d21c3f10f89d1368a3dd052ad4d763f42395 (patch) | |
| tree | 1d599cc86b3318a3fa8b353f4efe39c7fe705f00 /android/app | |
| parent | a050643585ea2f0e8fcb98dfeae6b893fc023618 (diff) | |
| parent | 3973f36af93de46156b335f75e0160e111965809 (diff) | |
| download | mullvadvpn-4ce0d21c3f10f89d1368a3dd052ad4d763f42395.tar.xz mullvadvpn-4ce0d21c3f10f89d1368a3dd052ad4d763f42395.zip | |
Merge branch 'upgrade-koin-libraries-droid-162'
Diffstat (limited to 'android/app')
3 files changed, 2 insertions, 8 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index d6b59b6a2d..5933093223 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -218,10 +218,8 @@ dependencies { implementation(Dependencies.Compose.uiUtil) implementation(Dependencies.jodaTime) implementation(Dependencies.Koin.core) - implementation(Dependencies.Koin.coreExt) - implementation(Dependencies.Koin.androidXFragment) - implementation(Dependencies.Koin.androidXScope) - implementation(Dependencies.Koin.androidXViewmodel) + implementation(Dependencies.Koin.android) + implementation(Dependencies.Koin.compose) implementation(Dependencies.Kotlin.reflect) implementation(Dependencies.Kotlin.stdlib) implementation(Dependencies.KotlinX.coroutinesAndroid) diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionContainer.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionContainer.kt index 7f895618fb..4b7d989444 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionContainer.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionContainer.kt @@ -7,7 +7,6 @@ import android.util.Log import net.mullvad.mullvadvpn.ipc.DispatchingHandler import net.mullvad.mullvadvpn.ipc.Event import net.mullvad.mullvadvpn.ipc.Request -import org.koin.core.component.KoinApiExtension import org.koin.core.component.KoinComponent import org.koin.core.component.get @@ -15,7 +14,6 @@ import org.koin.core.component.get // // The properties of this class can be used to send events to the service, to listen for events from // the service and to get values received from events. -@OptIn(KoinApiExtension::class) class ServiceConnectionContainer( val connection: Messenger, onServiceReady: (ServiceConnectionContainer) -> Unit, diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/ApplicationImageView.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/ApplicationImageView.kt index 519fefb180..43a8a58fbe 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/ApplicationImageView.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/ApplicationImageView.kt @@ -15,11 +15,9 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.applist.ApplicationsIconManager -import org.koin.core.component.KoinApiExtension import org.koin.core.component.KoinComponent import org.koin.core.component.inject -@OptIn(KoinApiExtension::class) class ApplicationImageView @JvmOverloads constructor( |