Address smaller nits and remove code from template.

rharter · May 24, 2022 · 7d5bc99 · 7d5bc99
1 parent 99dc378
commit 7d5bc99
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 27 deletions.
diff --git a/anvilcodegen/build.gradle b/anvilcodegen/build.gradle
@@ -1,5 +1,5 @@
-apply plugin: 'kotlin'
-apply plugin: 'kotlin-kapt'
+apply plugin: 'org.jetbrains.kotlin.jvm'
+apply plugin: 'org.jetbrains.kotlin.kapt'
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
@@ -14,6 +14,7 @@ dependencies {
     implementation "com.squareup.anvil:compiler-utils:2.4.0"
     implementation "com.squareup:kotlinpoet:1.10.2"
     implementation 'com.google.dagger:dagger:2.42'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation project(':lib.daggerscopes')
     compileOnly "com.google.auto.service:auto-service-annotations:1.0.1"
     kapt "com.google.auto.service:auto-service:1.0.1"

diff --git a/...src/main/java/com/gpeal/droidconanvilsample/anvilcompilers/ContributesApiCodeGenerator.kt b/...src/main/java/com/gpeal/droidconanvilsample/anvilcompilers/ContributesApiCodeGenerator.kt
@@ -20,8 +20,10 @@ import dagger.Provides
 import dagger.Reusable
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.psi.KtFile
+import retrofit2.Retrofit
 import java.io.File
 
+@Suppress("unused")
 @AutoService(CodeGenerator::class)
 class ContributesApiCodeGenerator : CodeGenerator {
 
@@ -37,19 +39,17 @@ class ContributesApiCodeGenerator : CodeGenerator {
     private fun generateModule(apiClass: ClassReference.Psi, codeGenDir: File): GeneratedFile {
         val generatedPackage = apiClass.packageFqName.toString()
         val moduleClassName = "${apiClass.shortName}_Module"
-        val component = AppScope::class.asClassName()
+        val scope = AppScope::class.asClassName()
         // Generate a Dagger module file called MyApi_Module.
         val content = FileSpec.buildFile(generatedPackage, moduleClassName) {
             addType(
                 TypeSpec.classBuilder(moduleClassName)
                     .addAnnotation(Module::class)
-                    .addAnnotation(AnnotationSpec.builder(ContributesTo::class).addMember("%T::class", component).build())
+                    .addAnnotation(AnnotationSpec.builder(ContributesTo::class).addMember("%T::class", scope).build())
                     .addFunction(
                         // @Provides @Reusable provideMyApi(retrofit: Retrofit): MyApi
                         FunSpec.builder("provide${apiClass.shortName}")
-                            .addParameter(
-                                ParameterSpec.builder("retrofit", ClassName("retrofit2", "Retrofit")).build(),
-                            )
+                            .addParameter("retrofit", Retrofit::class.asClassName())
                             .returns(apiClass.asClassName())
                             .addAnnotation(Provides::class)
                             .addAnnotation(Reusable::class)

diff --git a/app/build.gradle b/app/build.gradle
@@ -43,5 +43,4 @@ dependencies {
     implementation 'com.google.android.material:material:1.6.0'
     implementation 'com.google.dagger:dagger:2.42'
     kapt 'com.google.dagger:dagger-compiler:2.42'
-    testImplementation 'junit:junit:4.13.2'
 }
diff --git a/app/src/test/java/com/gpeal/droidconanvilsample/ExampleUnitTest.kt b/app/src/test/java/com/gpeal/droidconanvilsample/ExampleUnitTest.kt
diff --git a/...ata/src/main/java/com/gpeal/droidconanvilsample/feature/weatherdata/WeatherDataSources.kt b/...ata/src/main/java/com/gpeal/droidconanvilsample/feature/weatherdata/WeatherDataSources.kt
@@ -28,5 +28,4 @@ class WeatherDbDataSource @Inject constructor(private val weatherApi: WeatherApi
     override suspend fun getForecast(): List<Int> {
         return weatherApi.getWeather("San Francisco").nextDays.map { it.maxTemp.f }
     }
-
 }
diff --git a/.../src/main/java/com/gpeal/droidconanvilsample/feature/weatherdata/WeatherRepositoryImpl.kt b/.../src/main/java/com/gpeal/droidconanvilsample/feature/weatherdata/WeatherRepositoryImpl.kt
@@ -1,8 +1,7 @@
 package com.gpeal.droidconanvilsample.feature.weatherdata
 
-import android.util.Log
-import com.gpeal.droidconanvilsample.lib.daggerscopes.WeatherScope
 import com.gpeal.droidconanvilsample.lib.daggerscopes.SingleIn
+import com.gpeal.droidconanvilsample.lib.daggerscopes.WeatherScope
 import com.gpeal.droidconanvilsample.lib.userprefs.UserPrefs
 import com.gpeal.droidconanvilsample.lib.weatherdata.WeatherDataSource
 import com.gpeal.droidconanvilsample.lib.weatherdata.WeatherRepository