Skip to content
This repository was archived by the owner on Jan 10, 2025. It is now read-only.

Upgrade to latest dagger #946

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -37,5 +36,5 @@ class GithubApp : Application(), HasActivityInjector {
AppInjector.init(this)
}

override fun activityInjector() = dispatchingAndroidInjector
override fun androidInjector() = androidInjector
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Original file line number Diff line number Diff line change
Expand Up @@ -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].
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion GithubBrowserSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down