github/wulkanowy-mirror
1
0
Fork 1
mirror of https://github.com/wulkanowy/wulkanowy.git synced 2025-01-31 19:42:44 +01:00
Code

Bump dagger from 2.24 to 2.25.2 (#564)

Browse Source
This commit is contained in:
dependabot-preview[bot] 2019-10-24 18:24:22 +02:00 committed by Rafał Borcz
parent 497a3391d4
commit f234b71932
7 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -112,7 +112,7 @@ play {
ext { ext {
work_manager = "2.3.0-alpha03" work_manager = "2.3.0-alpha03"
room = "2.2.1" room = "2.2.1"
dagger = "2.24" dagger = "2.25.2"
chucker = "2.0.4" chucker = "2.0.4"
mockk = "1.9.2" mockk = "1.9.2"
} }

6
app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
View File

@ -29,17 +29,15 @@ import javax.inject.Singleton
@Suppress("unused") @Suppress("unused")
@AssistedModule @AssistedModule
@Module(includes = [AssistedInject_ServicesModule::class]) @Module(includes = [AssistedInject_ServicesModule::class, ServicesModule.Static::class])
abstract class ServicesModule { abstract class ServicesModule {
@Module @Module
companion object { object Static {
@JvmStatic
@Provides @Provides
fun provideWorkManager(context: Context) = WorkManager.getInstance(context) fun provideWorkManager(context: Context) = WorkManager.getInstance(context)
@JvmStatic
@Singleton @Singleton
@Provides @Provides
fun provideNotificationManager(context: Context) = NotificationManagerCompat.from(context) fun provideNotificationManager(context: Context) = NotificationManagerCompat.from(context)

5
app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
View File

@ -11,13 +11,12 @@ import io.github.wulkanowy.ui.modules.grade.statistics.GradeStatisticsFragment
import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment
@Suppress("unused") @Suppress("unused")
@Module @Module(includes = [GradeModule.Static::class])
abstract class GradeModule { abstract class GradeModule {
@Module @Module
companion object { object Static {
@JvmStatic
@PerFragment @PerFragment
@Provides @Provides
fun provideGradeAdapter(fragment: GradeFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager) fun provideGradeAdapter(fragment: GradeFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)

5
app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
View File

@ -11,13 +11,12 @@ import io.github.wulkanowy.ui.modules.login.studentselect.LoginStudentSelectFrag
import io.github.wulkanowy.ui.modules.login.symbol.LoginSymbolFragment import io.github.wulkanowy.ui.modules.login.symbol.LoginSymbolFragment
@Suppress("unused") @Suppress("unused")
@Module @Module(includes = [LoginModule.Static::class])
internal abstract class LoginModule { internal abstract class LoginModule {
@Module @Module
companion object { object Static {
@JvmStatic
@PerActivity @PerActivity
@Provides @Provides
fun provideLoginAdapter(activity: LoginActivity) = BaseFragmentPagerAdapter(activity.supportFragmentManager) fun provideLoginAdapter(activity: LoginActivity) = BaseFragmentPagerAdapter(activity.supportFragmentManager)

7
app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
View File

@ -29,25 +29,22 @@ import io.github.wulkanowy.ui.modules.note.NoteFragment
import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragment import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragment
import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersModule import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersModule
import io.github.wulkanowy.ui.modules.settings.SettingsFragment import io.github.wulkanowy.ui.modules.settings.SettingsFragment
import io.github.wulkanowy.ui.modules.schoolandteachers.teacher.TeacherFragment
import io.github.wulkanowy.ui.modules.timetable.TimetableFragment import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragment import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragment
@Suppress("unused") @Suppress("unused")
@Module @Module(includes = [MainModule.Static::class])
abstract class MainModule { abstract class MainModule {
@Module @Module
companion object { object Static {
@JvmStatic
@Provides @Provides
fun provideFragNavController(activity: MainActivity): FragNavController { fun provideFragNavController(activity: MainActivity): FragNavController {
return FragNavController(activity.supportFragmentManager, R.id.mainFragmentContainer) return FragNavController(activity.supportFragmentManager, R.id.mainFragmentContainer)
} }
//In activities must be injected as Lazy //In activities must be injected as Lazy
@JvmStatic
@Provides @Provides
fun provideElevationOverlayProvider(activity: MainActivity) = ElevationOverlayProvider(activity) fun provideElevationOverlayProvider(activity: MainActivity) = ElevationOverlayProvider(activity)
} }

5
app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
View File

@ -9,13 +9,12 @@ import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
import io.github.wulkanowy.ui.modules.message.tab.MessageTabFragment import io.github.wulkanowy.ui.modules.message.tab.MessageTabFragment
@Suppress("unused") @Suppress("unused")
@Module @Module(includes = [MessageModule.Static::class])
abstract class MessageModule { abstract class MessageModule {
@Module @Module
companion object { object Static {
@JvmStatic
@PerFragment @PerFragment
@Provides @Provides
fun provideMessageAdapter(fragment: MessageFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager) fun provideMessageAdapter(fragment: MessageFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)

5
app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersModule.kt
View File

@ -10,13 +10,12 @@ import io.github.wulkanowy.ui.modules.schoolandteachers.school.SchoolFragment
import io.github.wulkanowy.ui.modules.schoolandteachers.teacher.TeacherFragment import io.github.wulkanowy.ui.modules.schoolandteachers.teacher.TeacherFragment
@Suppress("unused") @Suppress("unused")
@Module @Module(includes = [SchoolAndTeachersModule.Static::class])
abstract class SchoolAndTeachersModule { abstract class SchoolAndTeachersModule {
@Module @Module
companion object { object Static {
@JvmStatic
@PerFragment @PerFragment
@Provides @Provides
fun provideSchoolAndTeachersAdapter(fragment: SchoolAndTeachersFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager) fun provideSchoolAndTeachersAdapter(fragment: SchoolAndTeachersFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)