Add Anvil

app/build.gradle

@@ -3,6 +3,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'com.squareup.anvil'
 apply from: '../versioning.gradle'
 apply from: "$rootDir/spotless.gradle"
 
@@ -19,7 +20,7 @@ android {
         targetSdkVersion target_sdk
         versionCode buildVersionCode()
         versionName buildVersionName()
-        testInstrumentationRunner "com.duckduckgo.app.TestRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         archivesBaseName = "duckduckgo-$versionName"
         vectorDrawables.useSupportLibrary = true
 
@@ -114,6 +115,7 @@ android {
 dependencies {
     implementation project(path: ':statistics')
     implementation project(path: ':common')
+    implementation project(path: ':di')
 
     implementation AndroidX.legacy.supportV4
     debugImplementation Square.leakCanary.android
@@ -180,10 +182,7 @@ dependencies {
     implementation AndroidX.work.rxJava2
 
     // Dagger
-    kapt Google.dagger.android.processor
     kapt Google.dagger.compiler
-    kaptAndroidTest "com.google.dagger:dagger-android-processor:_"
-    kaptAndroidTest "com.google.dagger:dagger-compiler:_"
 
     // Glide
     implementation "com.github.bumptech.glide:glide:_"

app/src/androidTest/java/com/duckduckgo/app/TestExtensions.kt

@@ -20,7 +20,8 @@ import androidx.annotation.UiThread
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
 import androidx.test.platform.app.InstrumentationRegistry
-import com.duckduckgo.app.di.TestAppComponent
+import com.duckduckgo.app.di.AppComponent
+import com.duckduckgo.app.global.DuckDuckGoApplication
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 
@@ -38,10 +39,10 @@ fun <T> LiveData<T>.blockingObserve(): T? {
     return value
 }
 
-fun getApp(): TestApplication {
-    return InstrumentationRegistry.getInstrumentation().targetContext.applicationContext as TestApplication
+fun getApp(): DuckDuckGoApplication {
+    return InstrumentationRegistry.getInstrumentation().targetContext.applicationContext as DuckDuckGoApplication
 }
 
-fun getDaggerComponent(): TestAppComponent {
-    return getApp().daggerAppComponent as TestAppComponent
+fun getDaggerComponent(): AppComponent {
+    return getApp().daggerAppComponent as AppComponent
 }

app/src/androidTest/java/com/duckduckgo/app/di/StubAppConfigurationDownloadModule.kt

@@ -17,11 +17,17 @@
 package com.duckduckgo.app.di
 
 import com.duckduckgo.app.job.ConfigurationDownloader
+import com.duckduckgo.di.scopes.AppObjectGraph
+import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
 import io.reactivex.Completable
 
 @Module
+@ContributesTo(
+    scope = AppObjectGraph::class,
+    replaces = [AppConfigurationDownloaderModule::class]
+)
 class StubAppConfigurationDownloadModule {
 
     @Provides

app/src/androidTest/java/com/duckduckgo/app/di/StubDatabaseModule.kt

@@ -22,11 +22,17 @@ import androidx.room.Room
 import com.duckduckgo.app.browser.httpauth.RealWebViewHttpAuthStore
 import com.duckduckgo.app.browser.httpauth.WebViewHttpAuthStore
 import com.duckduckgo.app.global.db.AppDatabase
+import com.duckduckgo.di.scopes.AppObjectGraph
+import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
 import javax.inject.Singleton
 
 @Module(includes = [DaoModule::class])
+@ContributesTo(
+    scope = AppObjectGraph::class,
+    replaces = [DatabaseModule::class]
+)
 class StubDatabaseModule {
 
     @Provides

app/src/androidTest/java/com/duckduckgo/app/di/StubJobSchedulerModule.kt

@@ -25,11 +25,17 @@ import com.duckduckgo.app.job.AndroidWorkScheduler
 import com.duckduckgo.app.job.JobCleaner
 import com.duckduckgo.app.job.WorkScheduler
 import com.duckduckgo.app.notification.AndroidNotificationScheduler
+import com.duckduckgo.di.scopes.AppObjectGraph
+import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
 import javax.inject.Singleton
 
 @Module
+@ContributesTo(
+    scope = AppObjectGraph::class,
+    replaces = [JobsModule::class]
+)
 class StubJobSchedulerModule {
 
     @Singleton

app/src/androidTest/java/com/duckduckgo/app/di/StubStatisticsModule.kt

@@ -26,13 +26,19 @@ import com.duckduckgo.app.statistics.api.StatisticsService
 import com.duckduckgo.app.statistics.api.StatisticsUpdater
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.statistics.store.StatisticsDataStore
+import com.duckduckgo.di.scopes.AppObjectGraph
+import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
 import io.reactivex.Completable
 import retrofit2.Retrofit
 import javax.inject.Singleton
 
 @Module
+@ContributesTo(
+    scope = AppObjectGraph::class,
+    replaces = [StatisticsModule::class]
+)
 class StubStatisticsModule {
 
     @Provides