Merge pull request #325 from nuhkoca/new-dagger-factory

Update Dagger and implement Component.Factory type for components
google · Aug 27, 2019 · 7b1e6c3 · 7b1e6c3
2 parents ed42346 + 0118bdc
commit 7b1e6c3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -42,7 +42,7 @@ buildscript {
         constraintLayoutVersion = '1.1.3'
         coreVersion = '1.2.0-alpha02'
         crashlyticsVersion = '2.9.8'
-        dagger = "2.16"
+        dagger = "2.24"
         dataBindingCompilerVersion = '3.0.1'
         drawerLayoutVersion = '1.1.0-alpha02'
         espressoVersion = '3.1.1'

diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/MainApplication.kt b/mobile/src/main/java/com/google/samples/apps/iosched/MainApplication.kt
@@ -57,7 +57,7 @@ class MainApplication : DaggerApplication() {
      * is a class generated by Dagger based on the `AppComponent` class.
      */
     override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
-        return DaggerAppComponent.builder().create(this)
+        return DaggerAppComponent.factory().create(this)
     }
 
     private fun enableStrictMode() {

diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/di/AppComponent.kt b/mobile/src/main/java/com/google/samples/apps/iosched/di/AppComponent.kt
@@ -18,12 +18,13 @@ package com.google.samples.apps.iosched.di
 
 import com.google.samples.apps.iosched.MainApplication
 import com.google.samples.apps.iosched.shared.di.BroadcastReceiverBindingModule
+import com.google.samples.apps.iosched.shared.di.FeatureFlagsModule
 import com.google.samples.apps.iosched.shared.di.ServiceBindingModule
 import com.google.samples.apps.iosched.shared.di.SharedModule
 import com.google.samples.apps.iosched.shared.di.ViewModelModule
-import com.google.samples.apps.iosched.shared.di.FeatureFlagsModule
 import com.google.samples.apps.iosched.ui.signin.SignInViewModelDelegateModule
 import com.google.samples.apps.iosched.ui.theme.ThemedActivityDelegateModule
+import dagger.BindsInstance
 import dagger.Component
 import dagger.android.AndroidInjector
 import dagger.android.support.AndroidSupportInjectionModule
@@ -53,6 +54,8 @@ import javax.inject.Singleton
     ]
 )
 interface AppComponent : AndroidInjector<MainApplication> {
-    @Component.Builder
-    abstract class Builder : AndroidInjector.Builder<MainApplication>()
+    @Component.Factory
+    interface Factory {
+        fun create(@BindsInstance application: MainApplication): AppComponent
+    }
 }