From 89e2df3384fb804feaad75f3fd3ec81c7848cd7b Mon Sep 17 00:00:00 2001
From: John Lombardo <john@lombardos.org>
Date: Tue, 12 Jan 2021 17:14:19 -0800
Subject: [PATCH] Upgrade to latest dagger

---
 .../main/java/com/android/example/github/GithubApp.kt    | 9 ++++-----
 .../main/java/com/android/example/github/MainActivity.kt | 9 ++++-----
 .../java/com/android/example/github/di/AppInjector.kt    | 4 ++--
 GithubBrowserSample/versions.gradle                      | 2 +-
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/GithubBrowserSample/app/src/main/java/com/android/example/github/GithubApp.kt b/GithubBrowserSample/app/src/main/java/com/android/example/github/GithubApp.kt
index 71b9c747..4fc02837 100644
--- a/GithubBrowserSample/app/src/main/java/com/android/example/github/GithubApp.kt
+++ b/GithubBrowserSample/app/src/main/java/com/android/example/github/GithubApp.kt
@@ -16,18 +16,17 @@
 
 package com.android.example.github
 
-import android.app.Activity
 import android.app.Application
 import com.android.example.github.di.AppInjector
 import dagger.android.DispatchingAndroidInjector
-import dagger.android.HasActivityInjector
+import dagger.android.HasAndroidInjector
 import timber.log.Timber
 import javax.inject.Inject
 
 
-class GithubApp : Application(), HasActivityInjector {
+class GithubApp : Application(), HasAndroidInjector {
     @Inject
-    lateinit var dispatchingAndroidInjector: DispatchingAndroidInjector<Activity>
+    lateinit var androidInjector: DispatchingAndroidInjector<Any>
 
     override fun onCreate() {
         super.onCreate()
@@ -37,5 +36,5 @@ class GithubApp : Application(), HasActivityInjector {
         AppInjector.init(this)
     }
 
-    override fun activityInjector() = dispatchingAndroidInjector
+    override fun androidInjector() = androidInjector
 }
diff --git a/GithubBrowserSample/app/src/main/java/com/android/example/github/MainActivity.kt b/GithubBrowserSample/app/src/main/java/com/android/example/github/MainActivity.kt
index 03cc87b9..f28f3341 100644
--- a/GithubBrowserSample/app/src/main/java/com/android/example/github/MainActivity.kt
+++ b/GithubBrowserSample/app/src/main/java/com/android/example/github/MainActivity.kt
@@ -17,20 +17,19 @@
 package com.android.example.github
 
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import androidx.appcompat.app.AppCompatActivity
 import dagger.android.DispatchingAndroidInjector
-import dagger.android.support.HasSupportFragmentInjector
+import dagger.android.HasAndroidInjector
 import javax.inject.Inject
 
-class MainActivity : AppCompatActivity(), HasSupportFragmentInjector {
+class MainActivity : AppCompatActivity(), HasAndroidInjector {
     @Inject
-    lateinit var dispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
+    lateinit var androidInjector: DispatchingAndroidInjector<Any>
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.main_activity)
     }
 
-    override fun supportFragmentInjector() = dispatchingAndroidInjector
+    override fun androidInjector() = androidInjector
 }
diff --git a/GithubBrowserSample/app/src/main/java/com/android/example/github/di/AppInjector.kt b/GithubBrowserSample/app/src/main/java/com/android/example/github/di/AppInjector.kt
index 67b4d346..f2f35b7b 100644
--- a/GithubBrowserSample/app/src/main/java/com/android/example/github/di/AppInjector.kt
+++ b/GithubBrowserSample/app/src/main/java/com/android/example/github/di/AppInjector.kt
@@ -24,8 +24,8 @@ import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
 import com.android.example.github.GithubApp
 import dagger.android.AndroidInjection
+import dagger.android.HasAndroidInjector
 import dagger.android.support.AndroidSupportInjection
-import dagger.android.support.HasSupportFragmentInjector
 
 /**
  * Helper class to automatically inject fragments if they implement [Injectable].
@@ -67,7 +67,7 @@ object AppInjector {
     }
 
     private fun handleActivity(activity: Activity) {
-        if (activity is HasSupportFragmentInjector) {
+        if (activity is HasAndroidInjector) {
             AndroidInjection.inject(activity)
         }
         if (activity is FragmentActivity) {
diff --git a/GithubBrowserSample/versions.gradle b/GithubBrowserSample/versions.gradle
index 9c80e392..31b31dc3 100644
--- a/GithubBrowserSample/versions.gradle
+++ b/GithubBrowserSample/versions.gradle
@@ -36,7 +36,7 @@ versions.cardview = "1.0.0"
 versions.constraint_layout = "2.0.0-alpha2"
 versions.core_ktx = "1.1.0"
 versions.coroutines = "1.4.1"
-versions.dagger = "2.16"
+versions.dagger = "2.30.1"
 versions.dexmaker = "2.2.0"
 versions.espresso = "3.2.0"
 versions.fragment = "1.2.1"