chore: update to koin 3.1.x

Author: kelsos

app/src/main/java/com/kelsos/mbrc/App.kt

@@ -15,14 +15,13 @@ import org.koin.android.ext.koin.androidContext
 import org.koin.androidx.fragment.koin.fragmentFactory
 import org.koin.androidx.workmanager.koin.workManagerFactory
 import org.koin.core.KoinExperimentalAPI
-import org.koin.core.component.KoinApiExtension
 import org.koin.core.context.startKoin
 import org.koin.core.module.Module
 import org.koin.dsl.module
 import timber.log.Timber
 
 @SuppressLint("Registered")
-@OptIn(KoinApiExtension::class, KoinExperimentalAPI::class)
+@OptIn(KoinExperimentalAPI::class)
 open class App : Application() {
 
   @CallSuper

app/src/main/java/com/kelsos/mbrc/AppModule.kt

@@ -149,55 +149,52 @@ import com.kelsos.mbrc.ui.navigation.player.VolumeDialogViewModel
 import com.squareup.moshi.Moshi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.asCoroutineDispatcher
-import org.koin.androidx.experimental.dsl.viewModel
 import org.koin.androidx.fragment.dsl.fragment
+import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.androidx.workmanager.dsl.worker
-import org.koin.core.component.KoinApiExtension
 import org.koin.core.qualifier.named
+import org.koin.dsl.bind
+import org.koin.dsl.factory
 import org.koin.dsl.module
-import org.koin.experimental.builder.factory
-import org.koin.experimental.builder.factoryBy
-import org.koin.experimental.builder.single
-import org.koin.experimental.builder.singleBy
+import org.koin.dsl.single
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 
-@OptIn(KoinApiExtension::class)
 val appModule = module {
   single { Moshi.Builder().build() }
-  singleBy<QueueUseCase, QueueUseCaseImpl>()
+  single<QueueUseCaseImpl>() bind QueueUseCase::class
 
-  singleBy<ConnectionRepository, ConnectionRepositoryImpl>()
+  single<ConnectionRepositoryImpl>() bind ConnectionRepository::class
 
-  singleBy<TrackRepository, TrackRepositoryImpl>()
-  singleBy<AlbumRepository, AlbumRepositoryImpl>()
-  singleBy<ArtistRepository, ArtistRepositoryImpl>()
-  singleBy<GenreRepository, GenreRepositoryImpl>()
+  single<TrackRepositoryImpl>() bind TrackRepository::class
+  single<AlbumRepositoryImpl>() bind AlbumRepository::class
+  single<ArtistRepositoryImpl>() bind ArtistRepository::class
+  single<GenreRepositoryImpl>() bind GenreRepository::class
 
-  singleBy<NowPlayingRepository, NowPlayingRepositoryImpl>()
-  singleBy<PlaylistRepository, PlaylistRepositoryImpl>()
+  single<NowPlayingRepositoryImpl>() bind NowPlayingRepository::class
+  single<PlaylistRepositoryImpl>() bind PlaylistRepository::class
   single<CoverCache>()
   single<SyncStatProvider>()
 
-  singleBy<SerializationAdapter, SerializationAdapterImpl>()
-  singleBy<DeserializationAdapter, DeserializationAdapterImpl>()
-  singleBy<DatabaseTransactionRunner, DatabaseTransactionRunnerImpl>()
-  singleBy<RequestManager, RequestManagerImpl>()
+  single<SerializationAdapterImpl>() bind SerializationAdapter::class
+  single<DeserializationAdapterImpl>() bind DeserializationAdapter::class
+  single<DatabaseTransactionRunnerImpl>() bind DatabaseTransactionRunner::class
+  single<RequestManagerImpl>() bind RequestManager::class
 
-  singleBy<UserActionUseCase, UserActionUseCaseImpl>()
+  single<UserActionUseCaseImpl>() bind UserActionUseCase::class
 
-  singleBy<ClientConnectionUseCase, ClientConnectionUseCaseImpl>()
+  single<ClientConnectionUseCaseImpl>() bind ClientConnectionUseCase::class
 
-  singleBy<SettingsManager, SettingsManagerImpl>()
-  singleBy<PlayingTrackCache, PlayingTrackCacheImpl>()
+  single<SettingsManagerImpl>() bind SettingsManager::class
+  single<PlayingTrackCacheImpl>() bind PlayingTrackCache::class
 
-  singleBy<LibrarySyncUseCase, LibrarySyncUseCaseImpl>()
-  singleBy<SyncWorkHandler, SyncWorkHandlerImpl>()
+  single<LibrarySyncUseCaseImpl>() bind LibrarySyncUseCase::class
+  single<SyncWorkHandlerImpl>() bind SyncWorkHandler::class
 
-  singleBy<RadioRepository, RadioRepositoryImpl>()
-  singleBy<ClientInformationStore, ClientInformationStoreImpl>()
-  singleBy<VolumeModifyUseCase, VolumeModifyUseCaseImpl>()
-  singleBy<OutputApi, OutputApiImpl>()
+  single<RadioRepositoryImpl>() bind RadioRepository::class
+  single<ClientInformationStoreImpl>() bind ClientInformationStore::class
+  single<VolumeModifyUseCaseImpl>() bind VolumeModifyUseCase::class
+  single<OutputApiImpl>() bind OutputApi::class
 
   single<AppState>()
   single<ConnectionState>()
@@ -209,22 +206,22 @@ val appModule = module {
     } as Executor
   }
 
-  singleBy<MessageQueue, MessageQueueImpl>()
-  singleBy<MessageHandler, MessageHandlerImpl>()
+  single<MessageQueueImpl>() bind MessageQueue::class
+  single<MessageHandlerImpl>() bind MessageHandler::class
 
-  singleBy<IClientConnectionManager, ClientConnectionManager>()
-  singleBy<CommandFactory, CommandFactoryImpl>()
-  singleBy<UiMessages, UiMessageQueueImpl>()
-  singleBy<RemoteServiceDiscovery, RemoteServiceDiscoveryImpl>()
+  single<ClientConnectionManager>() bind IClientConnectionManager::class
+  single<CommandFactoryImpl>() bind CommandFactory::class
+  single<UiMessageQueueImpl>() bind UiMessages::class
+  single<RemoteServiceDiscoveryImpl>() bind RemoteServiceDiscovery::class
 
-  singleBy<INotificationManager, SessionNotificationManager>()
-  singleBy<ServiceChecker, ServiceCheckerImpl>()
+  single<SessionNotificationManager>() bind INotificationManager::class
+  single<ServiceCheckerImpl>() bind ServiceChecker::class
   single<AppStateManager>()
 
   single<PopupActionHandler>()
   single<DefaultActionPreferenceStore>()
 
-  singleBy<WidgetUpdater, WidgetUpdaterImpl>()
+  single<WidgetUpdaterImpl>() bind WidgetUpdater::class
 
   single {
     val database = Executors.newSingleThreadExecutor { runnable ->
@@ -245,7 +242,7 @@ val appModule = module {
   single {
     WorkManager.getInstance(get())
   }
-  singleBy<WorkHandler, WorkHandlerImpl>()
+  single<WorkHandlerImpl>() bind WorkHandler::class
 
   single<ApiBase>()
 
@@ -281,10 +278,10 @@ val appModule = module {
 
   single<SocketActivityChecker>()
   single<SharedPreferences> { PreferenceManager.getDefaultSharedPreferences(get()) }
-  singleBy<ConnectivityVerifier, ConnectivityVerifierImpl>()
+  single<ConnectivityVerifierImpl>() bind ConnectivityVerifier::class
 
-  factoryBy<ClientInformationModel, ClientInformationModelImpl>()
-  factoryBy<MoveManager, MoveManagerImpl>()
+  factory<ClientInformationModelImpl>() bind ClientInformationModel::class
+  factory<MoveManagerImpl>() bind MoveManager::class
 
   factory<RemoteBroadcastReceiver>()
   factory<SessionNotificationManager>()

app/src/main/java/com/kelsos/mbrc/networking/protocol/CommandFactory.kt

@@ -20,10 +20,8 @@ import com.kelsos.mbrc.protocol.UpdateRating
 import com.kelsos.mbrc.protocol.UpdateRepeat
 import com.kelsos.mbrc.protocol.UpdateShuffle
 import com.kelsos.mbrc.protocol.UpdateVolume
-import org.koin.core.component.KoinApiExtension
 import org.koin.core.component.KoinComponent
 
-@OptIn(KoinApiExtension::class)
 class CommandFactoryImpl : CommandFactory, KoinComponent {
 
   @Suppress("ComplexMethod")

app/src/main/java/com/kelsos/mbrc/platform/RemoteBroadcastReceiver.kt

@@ -15,12 +15,10 @@ import com.kelsos.mbrc.platform.mediasession.RemoteViewIntentBuilder
 import com.kelsos.mbrc.preferences.CallAction
 import com.kelsos.mbrc.preferences.SettingsManager
 import kotlinx.coroutines.runBlocking
-import org.koin.core.component.KoinApiExtension
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import timber.log.Timber
 
-@OptIn(KoinApiExtension::class)
 class RemoteBroadcastReceiver : BroadcastReceiver(), KoinComponent {
 
   private val settingsManager: SettingsManager by inject()

app/src/main/java/com/kelsos/mbrc/platform/mediasession/MediaButtonReceiver.kt

@@ -3,10 +3,8 @@ package com.kelsos.mbrc.platform.mediasession
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import org.koin.core.component.KoinApiExtension
 import org.koin.core.component.KoinComponent
 
-@OptIn(KoinApiExtension::class)
 class MediaButtonReceiver : BroadcastReceiver(), KoinComponent {
 
   override fun onReceive(context: Context, intent: Intent) {

app/src/play/java/com/kelsos/mbrc/FlavorApp.kt

@@ -1,15 +1,15 @@
 package com.kelsos.mbrc
 
-import com.kelsos.mbrc.metrics.SyncMetrics
 import com.kelsos.mbrc.metrics.SyncMetricsImpl
 import org.koin.core.module.Module
+import org.koin.dsl.bind
 import org.koin.dsl.module
-import org.koin.experimental.builder.single
+import org.koin.dsl.single
 
 open class FlavorApp : App() {
   override fun appModules(): List<Module> {
     val playModule = module {
-      single<SyncMetrics> { SyncMetricsImpl() }
+      single<SyncMetricsImpl>() bind SyncMetricsImpl::class
     }
     return super.appModules().plus(playModule)
   }

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ androidx-test-espresso = ["androidx-test-espresso-intents", "androidx-test-espre
 coroutines = ["kotlin-coroutines-core", "kotlin-coroutines-android"]
 google-accompanist = ["google-accompanistCoil", "google-accompanistFlowLayout", "google-accompanistPager", "google-accompanistPagerIndicators", "google-accompanistSystemUIController"]
 google-firebase = ["google-firebase-analytics-ktx", "google-firebase-crashlytics-ktx", "google-firebase-perf-ktx"]
-koin = ["koin-android", "koin-viewmodel", "koin-ext", "koin-scope", "koin-fragment", "koin-workmanager"]
+koin = ["koin-android", "koin-workmanager", "koin-compose"]
 
 [libraries]
 android-threetenbp = { module = "com.jakewharton.threetenabp:threetenabp", version.ref = "android-threetenbp" }
@@ -80,11 +80,8 @@ gradlePlugin-protobuf = { module = "gradle.plugin.com.google.protobuf:protobuf-g
 gradlePlugin-safeArgs = { module = "androidx.navigation:navigation-safe-args-gradle-plugin", version.ref = "gradlePlugin-safeArgs" }
 gradlePlugin-versionsBenManes = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "gradlePlugin-versionsBenManes" }
 koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
-koin-ext = { module = "io.insert-koin:koin-androidx-ext", version.ref = "koin" }
-koin-fragment = { module = "io.insert-koin:koin-androidx-fragment", version.ref = "koin" }
-koin-scope = { module = "io.insert-koin:koin-androidx-scope", version.ref = "koin" }
+koin-compose = { module ="io.insert-koin:koin-androidx-compose", version.ref ="koin"}
 koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" }
-koin-viewmodel = { module = "io.insert-koin:koin-androidx-viewmodel", version.ref = "koin" }
 koin-workmanager = { module = "io.insert-koin:koin-androidx-workmanager", version.ref = "koin" }
 kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinCoroutines" }
 kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinCoroutines" }
@@ -143,7 +140,7 @@ gradlePlugin-performance = "1.4.0"
 gradlePlugin-protobuf = "0.8.16"
 gradlePlugin-safeArgs = "2.4.0-alpha05"
 gradlePlugin-versionsBenManes = "0.39.0"
-koin = "2.2.2"
+koin = "3.1.2"
 kotlin = "1.5.10"
 kotlinCoroutines = "1.5.0"
 lifecycleViewmodelCompose = "1.0.0-alpha07"