From 5029d09854342ec94600e1eac7a9f2ab6f43e171 Mon Sep 17 00:00:00 2001 From: Alexey Illarionov Date: Tue, 16 Jan 2024 19:08:47 +0300 Subject: [PATCH] Update anvil-codegen (#250) --- .../inject/initializer/TestPixnewsAppInitializerComponent.kt | 2 +- .../ru/pixnews/inject/DebugStrictModeInitializerModule.kt | 2 +- .../ru/pixnews/inject/experiments/ExperimentsComponent.kt | 2 +- .../kotlin/ru/pixnews/inject/experiments/ExperimentsModule.kt | 2 +- .../inject/initializer/MainPixnewsAppInitializerComponent.kt | 2 +- .../ru/pixnews/inject/initializer/PixnewsInitializersModule.kt | 2 +- app/src/main/kotlin/ru/pixnews/inject/ui/MainActivityModule.kt | 2 +- .../feature/featuretoggles/inject/ToggleListViewModelModule.kt | 2 +- .../foundation/di/ui/base/activity/ActivitySubcomponent.kt | 2 +- .../foundation/di/ui/base/activity/PixnewsActivityModule.kt | 2 +- .../foundation/di/ui/base/fragment/FragmentSubcomponent.kt | 2 +- .../foundation/di/ui/base/fragment/PixnewsFragmentFactory.kt | 2 +- .../pixnews/foundation/di/ui/base/viewmodel/ViewModelModule.kt | 2 +- .../foundation/di/ui/base/viewmodel/ViewModelSubcomponent.kt | 2 +- .../foundation/di/workmanager/WorkManagerSubcomponent.kt | 2 +- .../foundation/di/workmanager/WorkManagerSubcomponentModule.kt | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/src/androidTest/kotlin/ru/pixnews/inject/initializer/TestPixnewsAppInitializerComponent.kt b/app/src/androidTest/kotlin/ru/pixnews/inject/initializer/TestPixnewsAppInitializerComponent.kt index b2a4852a..d18e5850 100644 --- a/app/src/androidTest/kotlin/ru/pixnews/inject/initializer/TestPixnewsAppInitializerComponent.kt +++ b/app/src/androidTest/kotlin/ru/pixnews/inject/initializer/TestPixnewsAppInitializerComponent.kt @@ -7,7 +7,7 @@ package ru.pixnews.inject.initializer import com.squareup.anvil.annotations.MergeComponent import com.squareup.anvil.annotations.optional.SingleIn -import ru.pixnews.anvil.codegen.initializer.inject.wiring.AppInitializersScope +import ru.pixnews.anvil.codegen.initializer.inject.AppInitializersScope import ru.pixnews.di.root.component.PixnewsAppComponent import ru.pixnews.inject.MockWebServerHolder diff --git a/app/src/debug/kotlin/ru/pixnews/inject/DebugStrictModeInitializerModule.kt b/app/src/debug/kotlin/ru/pixnews/inject/DebugStrictModeInitializerModule.kt index f3f06843..bbdaaca6 100644 --- a/app/src/debug/kotlin/ru/pixnews/inject/DebugStrictModeInitializerModule.kt +++ b/app/src/debug/kotlin/ru/pixnews/inject/DebugStrictModeInitializerModule.kt @@ -9,7 +9,7 @@ import com.squareup.anvil.annotations.ContributesTo import dagger.Binds import dagger.Module import dagger.multibindings.IntoSet -import ru.pixnews.anvil.codegen.initializer.inject.wiring.AppInitializersScope +import ru.pixnews.anvil.codegen.initializer.inject.AppInitializersScope import ru.pixnews.foundation.initializers.Initializer import ru.pixnews.initializers.DebugStrictModeInitializer diff --git a/app/src/main/kotlin/ru/pixnews/inject/experiments/ExperimentsComponent.kt b/app/src/main/kotlin/ru/pixnews/inject/experiments/ExperimentsComponent.kt index b2a99880..1f610086 100644 --- a/app/src/main/kotlin/ru/pixnews/inject/experiments/ExperimentsComponent.kt +++ b/app/src/main/kotlin/ru/pixnews/inject/experiments/ExperimentsComponent.kt @@ -7,7 +7,7 @@ package ru.pixnews.inject.experiments import com.squareup.anvil.annotations.MergeComponent import com.squareup.anvil.annotations.optional.SingleIn -import ru.pixnews.anvil.codegen.experiment.inject.wiring.ExperimentScope +import ru.pixnews.anvil.codegen.experiment.inject.ExperimentScope import ru.pixnews.foundation.di.base.DaggerMap import ru.pixnews.foundation.di.base.DaggerSet import ru.pixnews.foundation.featuretoggles.Experiment diff --git a/app/src/main/kotlin/ru/pixnews/inject/experiments/ExperimentsModule.kt b/app/src/main/kotlin/ru/pixnews/inject/experiments/ExperimentsModule.kt index f7b31b96..c2fae1fe 100644 --- a/app/src/main/kotlin/ru/pixnews/inject/experiments/ExperimentsModule.kt +++ b/app/src/main/kotlin/ru/pixnews/inject/experiments/ExperimentsModule.kt @@ -10,7 +10,7 @@ import dagger.Module import dagger.Provides import dagger.Reusable import dagger.multibindings.Multibinds -import ru.pixnews.anvil.codegen.experiment.inject.wiring.ExperimentScope +import ru.pixnews.anvil.codegen.experiment.inject.ExperimentScope import ru.pixnews.foundation.di.base.DaggerMap import ru.pixnews.foundation.di.base.DaggerSet import ru.pixnews.foundation.featuretoggles.Experiment diff --git a/app/src/main/kotlin/ru/pixnews/inject/initializer/MainPixnewsAppInitializerComponent.kt b/app/src/main/kotlin/ru/pixnews/inject/initializer/MainPixnewsAppInitializerComponent.kt index 0bbb78a3..178c8db3 100644 --- a/app/src/main/kotlin/ru/pixnews/inject/initializer/MainPixnewsAppInitializerComponent.kt +++ b/app/src/main/kotlin/ru/pixnews/inject/initializer/MainPixnewsAppInitializerComponent.kt @@ -8,7 +8,7 @@ package ru.pixnews.inject.initializer import com.squareup.anvil.annotations.MergeComponent import com.squareup.anvil.annotations.optional.SingleIn import dagger.Component -import ru.pixnews.anvil.codegen.initializer.inject.wiring.AppInitializersScope +import ru.pixnews.anvil.codegen.initializer.inject.AppInitializersScope import ru.pixnews.di.root.component.PixnewsAppComponent import ru.pixnews.inject.FirebaseModule.FirebaseProviderHolder diff --git a/app/src/main/kotlin/ru/pixnews/inject/initializer/PixnewsInitializersModule.kt b/app/src/main/kotlin/ru/pixnews/inject/initializer/PixnewsInitializersModule.kt index 0005c303..d26bc1fc 100644 --- a/app/src/main/kotlin/ru/pixnews/inject/initializer/PixnewsInitializersModule.kt +++ b/app/src/main/kotlin/ru/pixnews/inject/initializer/PixnewsInitializersModule.kt @@ -9,7 +9,7 @@ import com.squareup.anvil.annotations.ContributesTo import dagger.Module import dagger.Provides import dagger.multibindings.Multibinds -import ru.pixnews.anvil.codegen.initializer.inject.wiring.AppInitializersScope +import ru.pixnews.anvil.codegen.initializer.inject.AppInitializersScope import ru.pixnews.foundation.coroutines.IoCoroutineDispatcherProvider import ru.pixnews.foundation.coroutines.RootCoroutineScope import ru.pixnews.foundation.di.base.DaggerSet diff --git a/app/src/main/kotlin/ru/pixnews/inject/ui/MainActivityModule.kt b/app/src/main/kotlin/ru/pixnews/inject/ui/MainActivityModule.kt index 9f2088e4..eb8e9da0 100644 --- a/app/src/main/kotlin/ru/pixnews/inject/ui/MainActivityModule.kt +++ b/app/src/main/kotlin/ru/pixnews/inject/ui/MainActivityModule.kt @@ -8,7 +8,7 @@ package ru.pixnews.inject.ui import com.squareup.anvil.annotations.ContributesTo import dagger.Module import dagger.Provides -import ru.pixnews.anvil.codegen.activity.inject.wiring.ActivityScope +import ru.pixnews.anvil.codegen.activity.inject.ActivityScope import ru.pixnews.foundation.featuretoggles.FeatureManager import ru.pixnews.foundation.featuretoggles.FeatureToggle import ru.pixnews.foundation.featuretoggles.getFeatureToggle diff --git a/feature/featuretoggles/public/src/main/kotlin/ru/pixnews/feature/featuretoggles/inject/ToggleListViewModelModule.kt b/feature/featuretoggles/public/src/main/kotlin/ru/pixnews/feature/featuretoggles/inject/ToggleListViewModelModule.kt index 577357ce..f7da0ee1 100644 --- a/feature/featuretoggles/public/src/main/kotlin/ru/pixnews/feature/featuretoggles/inject/ToggleListViewModelModule.kt +++ b/feature/featuretoggles/public/src/main/kotlin/ru/pixnews/feature/featuretoggles/inject/ToggleListViewModelModule.kt @@ -11,7 +11,7 @@ import com.squareup.anvil.annotations.ContributesTo import com.squareup.anvil.annotations.optional.SingleIn import dagger.Module import dagger.Provides -import ru.pixnews.anvil.codegen.viewmodel.inject.wiring.ViewModelScope +import ru.pixnews.anvil.codegen.viewmodel.inject.ViewModelScope import ru.pixnews.foundation.coroutines.IoCoroutineDispatcherProvider import ru.pixnews.foundation.coroutines.RootCoroutineScope import ru.pixnews.foundation.di.base.DaggerMap diff --git a/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/activity/ActivitySubcomponent.kt b/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/activity/ActivitySubcomponent.kt index 07c0adfc..2ab84b36 100644 --- a/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/activity/ActivitySubcomponent.kt +++ b/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/activity/ActivitySubcomponent.kt @@ -11,8 +11,8 @@ import com.squareup.anvil.annotations.ContributesSubcomponent import com.squareup.anvil.annotations.ContributesTo import com.squareup.anvil.annotations.optional.SingleIn import dagger.BindsInstance +import ru.pixnews.anvil.codegen.activity.inject.ActivityScope import ru.pixnews.anvil.codegen.activity.inject.wiring.ActivityInjector -import ru.pixnews.anvil.codegen.activity.inject.wiring.ActivityScope import ru.pixnews.foundation.di.base.scopes.AppScope @SingleIn(ActivityScope::class) diff --git a/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/activity/PixnewsActivityModule.kt b/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/activity/PixnewsActivityModule.kt index 9f06471d..413284b2 100644 --- a/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/activity/PixnewsActivityModule.kt +++ b/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/activity/PixnewsActivityModule.kt @@ -13,8 +13,8 @@ import dagger.Module import dagger.Provides import dagger.Reusable import dagger.multibindings.Multibinds +import ru.pixnews.anvil.codegen.activity.inject.ActivityScope import ru.pixnews.anvil.codegen.activity.inject.wiring.ActivityInjector -import ru.pixnews.anvil.codegen.activity.inject.wiring.ActivityScope import ru.pixnews.anvil.codegen.activity.inject.wiring.DefaultActivityInjector import ru.pixnews.foundation.di.base.DaggerMap diff --git a/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/fragment/FragmentSubcomponent.kt b/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/fragment/FragmentSubcomponent.kt index d8150107..66ad4701 100644 --- a/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/fragment/FragmentSubcomponent.kt +++ b/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/fragment/FragmentSubcomponent.kt @@ -9,7 +9,7 @@ import androidx.annotation.RestrictTo import androidx.fragment.app.Fragment import com.squareup.anvil.annotations.ContributesSubcomponent import com.squareup.anvil.annotations.optional.SingleIn -import ru.pixnews.anvil.codegen.activity.inject.wiring.ActivityScope +import ru.pixnews.anvil.codegen.activity.inject.ActivityScope import javax.inject.Provider @SingleIn(FragmentScope::class) diff --git a/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/fragment/PixnewsFragmentFactory.kt b/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/fragment/PixnewsFragmentFactory.kt index 1ec63bf3..41f8ebbd 100644 --- a/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/fragment/PixnewsFragmentFactory.kt +++ b/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/fragment/PixnewsFragmentFactory.kt @@ -10,7 +10,7 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentFactory import com.squareup.anvil.annotations.ContributesBinding import dagger.Reusable -import ru.pixnews.anvil.codegen.activity.inject.wiring.ActivityScope +import ru.pixnews.anvil.codegen.activity.inject.ActivityScope import javax.inject.Inject @Reusable diff --git a/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/viewmodel/ViewModelModule.kt b/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/viewmodel/ViewModelModule.kt index 298c4915..5f457fe5 100644 --- a/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/viewmodel/ViewModelModule.kt +++ b/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/viewmodel/ViewModelModule.kt @@ -10,8 +10,8 @@ import androidx.lifecycle.ViewModel import com.squareup.anvil.annotations.ContributesTo import dagger.Module import dagger.multibindings.Multibinds +import ru.pixnews.anvil.codegen.viewmodel.inject.ViewModelScope import ru.pixnews.anvil.codegen.viewmodel.inject.wiring.ViewModelFactory -import ru.pixnews.anvil.codegen.viewmodel.inject.wiring.ViewModelScope import ru.pixnews.foundation.di.base.DaggerMap @Module diff --git a/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/viewmodel/ViewModelSubcomponent.kt b/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/viewmodel/ViewModelSubcomponent.kt index 1719f59f..4b8dce30 100644 --- a/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/viewmodel/ViewModelSubcomponent.kt +++ b/foundation/di/ui-base/src/main/kotlin/ru/pixnews/foundation/di/ui/base/viewmodel/ViewModelSubcomponent.kt @@ -12,8 +12,8 @@ import com.squareup.anvil.annotations.ContributesSubcomponent import com.squareup.anvil.annotations.ContributesTo import com.squareup.anvil.annotations.optional.SingleIn import dagger.BindsInstance +import ru.pixnews.anvil.codegen.viewmodel.inject.ViewModelScope import ru.pixnews.anvil.codegen.viewmodel.inject.wiring.ViewModelFactory -import ru.pixnews.anvil.codegen.viewmodel.inject.wiring.ViewModelScope import ru.pixnews.foundation.di.base.DaggerMap import ru.pixnews.foundation.di.base.scopes.AppScope import javax.inject.Provider diff --git a/foundation/di/workmanager/src/main/kotlin/ru/pixnews/foundation/di/workmanager/WorkManagerSubcomponent.kt b/foundation/di/workmanager/src/main/kotlin/ru/pixnews/foundation/di/workmanager/WorkManagerSubcomponent.kt index e6dd6b74..a2cfbbed 100644 --- a/foundation/di/workmanager/src/main/kotlin/ru/pixnews/foundation/di/workmanager/WorkManagerSubcomponent.kt +++ b/foundation/di/workmanager/src/main/kotlin/ru/pixnews/foundation/di/workmanager/WorkManagerSubcomponent.kt @@ -9,8 +9,8 @@ import androidx.annotation.RestrictTo import androidx.work.CoroutineWorker import com.squareup.anvil.annotations.ContributesSubcomponent import com.squareup.anvil.annotations.optional.SingleIn +import ru.pixnews.anvil.codegen.workmanager.inject.WorkManagerScope import ru.pixnews.anvil.codegen.workmanager.inject.wiring.CoroutineWorkerFactory -import ru.pixnews.anvil.codegen.workmanager.inject.wiring.WorkManagerScope import ru.pixnews.foundation.di.base.DaggerMap import ru.pixnews.foundation.di.base.scopes.AppScope diff --git a/foundation/di/workmanager/src/main/kotlin/ru/pixnews/foundation/di/workmanager/WorkManagerSubcomponentModule.kt b/foundation/di/workmanager/src/main/kotlin/ru/pixnews/foundation/di/workmanager/WorkManagerSubcomponentModule.kt index 3821d84c..6765c17c 100644 --- a/foundation/di/workmanager/src/main/kotlin/ru/pixnews/foundation/di/workmanager/WorkManagerSubcomponentModule.kt +++ b/foundation/di/workmanager/src/main/kotlin/ru/pixnews/foundation/di/workmanager/WorkManagerSubcomponentModule.kt @@ -10,8 +10,8 @@ import androidx.work.CoroutineWorker import com.squareup.anvil.annotations.ContributesTo import dagger.Module import dagger.multibindings.Multibinds +import ru.pixnews.anvil.codegen.workmanager.inject.WorkManagerScope import ru.pixnews.anvil.codegen.workmanager.inject.wiring.CoroutineWorkerFactory -import ru.pixnews.anvil.codegen.workmanager.inject.wiring.WorkManagerScope import ru.pixnews.foundation.di.base.DaggerMap @ContributesTo(WorkManagerScope::class)