Skip to content

Commit 4476655

Browse files
mikescamellmikescamell
committed
Update Anvil to 2.6.1, Dagger to 2.56.2
This also required some code changes to remove some deprecated classes.
1 parent e66b36b commit 4476655

8 files changed

+32
-31
lines changed

‎anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributeToActivityStarterCodeGenerator.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ContributeToActivityStarterCodeGenerator : CodeGenerator {
4040

4141
override fun isApplicable(context: AnvilContext): Boolean = true
4242

43-
override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFile> {
43+
override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFileWithSources> {
4444
return projectFiles.classAndInnerClassReferences(module)
4545
.toList()
4646
.filter { it.isAnnotatedWith(ContributeToActivityStarter::class.fqName) }
@@ -52,7 +52,7 @@ class ContributeToActivityStarterCodeGenerator : CodeGenerator {
5252
.toList()
5353
}
5454

55-
private fun generateParameterToActivityMapper(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFile {
55+
private fun generateParameterToActivityMapper(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFileWithSources {
5656
val generatedPackage = vmClass.packageFqName.toString()
5757
val moduleClassName = "${vmClass.shortName}_ActivityMapper"
5858

@@ -73,7 +73,7 @@ class ContributeToActivityStarterCodeGenerator : CodeGenerator {
7373
}
7474
}
7575

76-
return createGeneratedFile(codeGenDir, generatedPackage, moduleClassName, content)
76+
return createGeneratedFile(codeGenDir, generatedPackage, moduleClassName, content, vmClass.containingFileAsJavaFile)
7777
}
7878

7979
private fun createMapperClass(

‎anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributesPluginPointCodeGenerator.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class ContributesPluginPointCodeGenerator : CodeGenerator {
4545

4646
override fun isApplicable(context: AnvilContext): Boolean = true
4747

48-
override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFile> {
48+
override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFileWithSources> {
4949
return projectFiles.classAndInnerClassReferences(module)
5050
.toList()
5151
.filter { it.isAnnotatedWith(ContributesPluginPoint::class.fqName) }
@@ -58,7 +58,7 @@ class ContributesPluginPointCodeGenerator : CodeGenerator {
5858
.toList()
5959
}
6060

61-
private fun generatePluginPoint(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFile {
61+
private fun generatePluginPoint(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFileWithSources {
6262
val generatedPackage = vmClass.packageFqName.toString()
6363
val pluginPointClassName = "${vmClass.shortName}_PluginPoint"
6464
val scope = vmClass.annotations.first { it.fqName == ContributesPluginPoint::class.fqName }.scopeOrNull(0)!!
@@ -132,10 +132,10 @@ class ContributesPluginPointCodeGenerator : CodeGenerator {
132132
)
133133
}
134134

135-
return createGeneratedFile(codeGenDir, generatedPackage, pluginPointClassName, content)
135+
return createGeneratedFile(codeGenDir, generatedPackage, pluginPointClassName, content, vmClass.containingFileAsJavaFile)
136136
}
137137

138-
private fun generateBindingModule(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFile {
138+
private fun generateBindingModule(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFileWithSources {
139139
val generatedPackage = vmClass.packageFqName.toString()
140140
val moduleClassName = "${vmClass.shortName}_PluginPoint_Module"
141141
val scope = vmClass.annotations.first { it.fqName == ContributesPluginPoint::class.fqName }.scopeOrNull(0)!!
@@ -180,7 +180,7 @@ class ContributesPluginPointCodeGenerator : CodeGenerator {
180180
).build()
181181
}
182182

183-
return createGeneratedFile(codeGenDir, generatedPackage, moduleClassName, content)
183+
return createGeneratedFile(codeGenDir, generatedPackage, moduleClassName, content, vmClass.containingFileAsJavaFile)
184184
}
185185

186186
companion object {

‎anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributesRemoteFeatureCodeGenerator.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class ContributesRemoteFeatureCodeGenerator : CodeGenerator {
5151
codeGenDir: File,
5252
module: ModuleDescriptor,
5353
projectFiles: Collection<KtFile>,
54-
): Collection<GeneratedFile> {
54+
): Collection<GeneratedFileWithSources> {
5555
return projectFiles.classAndInnerClassReferences(module)
5656
.toList()
5757
.filter { it.isAnnotatedWith(ContributesRemoteFeature::class.fqName) }
@@ -72,7 +72,7 @@ class ContributesRemoteFeatureCodeGenerator : CodeGenerator {
7272
codeGenDir: File,
7373
module: ModuleDescriptor,
7474
customStorePresence: CustomStorePresence,
75-
): GeneratedFile {
75+
): GeneratedFileWithSources {
7676
val generatedPackage = vmClass.packageFqName.toString()
7777
val generatedClassName = "${vmClass.shortName}_ProxyModule"
7878
val annotation = vmClass.annotations.first { it.fqName == ContributesRemoteFeature::class.fqName }
@@ -187,15 +187,15 @@ class ContributesRemoteFeatureCodeGenerator : CodeGenerator {
187187
)
188188
}
189189

190-
return createGeneratedFile(codeGenDir, generatedPackage, generatedClassName, content)
190+
return createGeneratedFile(codeGenDir, generatedPackage, generatedClassName, content, vmClass.containingFileAsJavaFile)
191191
}
192192

193193
private fun generateRemoteFeature(
194194
vmClass: ClassReference.Psi,
195195
codeGenDir: File,
196196
module: ModuleDescriptor,
197197
customStorePresence: CustomStorePresence,
198-
): GeneratedFile {
198+
): GeneratedFileWithSources {
199199
val generatedPackage = vmClass.packageFqName.toString()
200200
val generatedClassName = "${vmClass.shortName}_RemoteFeature"
201201
val annotation = vmClass.annotations.first { it.fqName == ContributesRemoteFeature::class.fqName }
@@ -319,7 +319,7 @@ class ContributesRemoteFeatureCodeGenerator : CodeGenerator {
319319
)
320320
}
321321

322-
return createGeneratedFile(codeGenDir, generatedPackage, generatedClassName, content)
322+
return createGeneratedFile(codeGenDir, generatedPackage, generatedClassName, content, vmClass.containingFileAsJavaFile)
323323
}
324324

325325
private fun generateOptionalBindings(

‎anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributesServiceApiCodeGenerator.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ContributesServiceApiCodeGenerator : CodeGenerator {
4646

4747
override fun isApplicable(context: AnvilContext): Boolean = true
4848

49-
override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFile> {
49+
override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFileWithSources> {
5050
return projectFiles.classAndInnerClassReferences(module)
5151
.toList()
5252
.filter { reference -> reference.isAnnotatedWith(serviceApiAnnotations.map { it.fqName }) }
@@ -58,7 +58,7 @@ class ContributesServiceApiCodeGenerator : CodeGenerator {
5858
.toList()
5959
}
6060

61-
private fun generateServiceApiModule(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFile {
61+
private fun generateServiceApiModule(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFileWithSources {
6262
val generatedPackage = vmClass.packageFqName.toString()
6363
val moduleClassName = "${vmClass.shortName}_Module"
6464

@@ -125,7 +125,7 @@ class ContributesServiceApiCodeGenerator : CodeGenerator {
125125
).build()
126126
}
127127

128-
return createGeneratedFile(codeGenDir, generatedPackage, moduleClassName, content)
128+
return createGeneratedFile(codeGenDir, generatedPackage, moduleClassName, content, vmClass.containingFileAsJavaFile)
129129
}
130130

131131
private fun ClassReference.Psi.serviceApiClassName(

‎anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributesSubComponentCodeGenerator.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class ContributesSubComponentCodeGenerator : CodeGenerator {
5050

5151
override fun isApplicable(context: AnvilContext): Boolean = true
5252

53-
override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFile> {
53+
override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFileWithSources> {
5454
return projectFiles.classAndInnerClassReferences(module)
5555
.toList()
5656
.filter { it.isAnnotatedWith(InjectWith::class.fqName) }
@@ -69,7 +69,7 @@ class ContributesSubComponentCodeGenerator : CodeGenerator {
6969
.toList()
7070
}
7171

72-
private fun generateActivityInjector(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFile {
72+
private fun generateActivityInjector(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFileWithSources {
7373
val generatedPackage = vmClass.packageFqName.toString()
7474
val activityInjectorInterfaceName = "${vmClass.shortName}_Injector"
7575
val scope = vmClass.annotations.first { it.fqName == InjectWith::class.fqName }.scopeOrNull(0)!!
@@ -105,9 +105,9 @@ class ContributesSubComponentCodeGenerator : CodeGenerator {
105105
).build()
106106
}
107107

108-
return createGeneratedFile(codeGenDir, generatedPackage, activityInjectorInterfaceName, content)
108+
return createGeneratedFile(codeGenDir, generatedPackage, activityInjectorInterfaceName, content, vmClass.containingFileAsJavaFile)
109109
}
110-
private fun generateSubcomponentFactory(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFile {
110+
private fun generateSubcomponentFactory(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFileWithSources {
111111
val generatedPackage = vmClass.packageFqName.toString()
112112
val subcomponentFactoryClassName = vmClass.subComponentName()
113113
val scope = vmClass.annotations.first { it.fqName == InjectWith::class.fqName }.scopeOrNull(0)!!
@@ -159,7 +159,7 @@ class ContributesSubComponentCodeGenerator : CodeGenerator {
159159
).build()
160160
}
161161

162-
return createGeneratedFile(codeGenDir, generatedPackage, subcomponentFactoryClassName, content)
162+
return createGeneratedFile(codeGenDir, generatedPackage, subcomponentFactoryClassName, content, vmClass.containingFileAsJavaFile)
163163
}
164164

165165
private fun generateParentComponentInterface(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): TypeSpec {
@@ -184,7 +184,7 @@ class ContributesSubComponentCodeGenerator : CodeGenerator {
184184
.build()
185185
}
186186

187-
private fun generateSubcomponentFactoryBindingModule(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFile {
187+
private fun generateSubcomponentFactoryBindingModule(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFileWithSources {
188188
val generatedPackage = vmClass.packageFqName.toString()
189189
val moduleClassName = "${vmClass.subComponentName()}_Module"
190190
val scope = vmClass.annotations.first { it.fqName == InjectWith::class.fqName }.scopeOrNull(0)!!
@@ -219,7 +219,7 @@ class ContributesSubComponentCodeGenerator : CodeGenerator {
219219
).build()
220220
}
221221

222-
return createGeneratedFile(codeGenDir, generatedPackage, moduleClassName, content)
222+
return createGeneratedFile(codeGenDir, generatedPackage, moduleClassName, content, vmClass.containingFileAsJavaFile)
223223
}
224224

225225
private fun FqName.subComponentAnnotation(module: ModuleDescriptor, delayGeneration: Boolean): AnnotationSpec {

‎anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributesViewModelCodeGenerator.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ContributesViewModelCodeGenerator : CodeGenerator {
4242

4343
override fun isApplicable(context: AnvilContext): Boolean = true
4444

45-
override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFile> {
45+
override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFileWithSources> {
4646
return projectFiles.classAndInnerClassReferences(module)
4747
.toList()
4848
.filter { it.isAnnotatedWith(ContributesViewModel::class.fqName) }
@@ -52,7 +52,7 @@ class ContributesViewModelCodeGenerator : CodeGenerator {
5252
.toList()
5353
}
5454

55-
private fun generateFactoryPlugin(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFile {
55+
private fun generateFactoryPlugin(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFileWithSources {
5656
val generatedPackage = vmClass.packageFqName.toString()
5757
val factoryClassName = "${vmClass.shortName}_ViewModelFactory"
5858
val scope = vmClass.annotations.first { it.fqName == ContributesViewModel::class.fqName }.scopeOrNull(0)
@@ -122,7 +122,7 @@ class ContributesViewModelCodeGenerator : CodeGenerator {
122122
).build()
123123
}
124124

125-
return createGeneratedFile(codeGenDir, generatedPackage, factoryClassName, content)
125+
return createGeneratedFile(codeGenDir, generatedPackage, factoryClassName, content, vmClass.containingFileAsJavaFile)
126126
}
127127

128128
companion object {

‎anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributesWorkerCodeGenerator.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import com.squareup.anvil.annotations.ExperimentalAnvilApi
2323
import com.squareup.anvil.compiler.api.AnvilContext
2424
import com.squareup.anvil.compiler.api.CodeGenerator
2525
import com.squareup.anvil.compiler.api.GeneratedFile
26+
import com.squareup.anvil.compiler.api.GeneratedFileWithSources
2627
import com.squareup.anvil.compiler.api.createGeneratedFile
2728
import com.squareup.anvil.compiler.internal.asClassName
2829
import com.squareup.anvil.compiler.internal.buildFile
@@ -59,7 +60,7 @@ class ContributesWorkerCodeGenerator : CodeGenerator {
5960
codeGenDir: File,
6061
module: ModuleDescriptor,
6162
projectFiles: Collection<KtFile>,
62-
): Collection<GeneratedFile> = projectFiles.classAndInnerClassReferences(module)
63+
): Collection<GeneratedFileWithSources> = projectFiles.classAndInnerClassReferences(module)
6364
.toList()
6465
.filter { it.isAnnotatedWith(ContributesWorker::class.fqName) }
6566
.flatMap {
@@ -71,7 +72,7 @@ class ContributesWorkerCodeGenerator : CodeGenerator {
7172
vmClass: ClassReference.Psi,
7273
codeGenDir: File,
7374
module: ModuleDescriptor,
74-
): GeneratedFile {
75+
): GeneratedFileWithSources {
7576
val generatedPackage = vmClass.packageFqName.toString()
7677
val workerPluginName = "${vmClass.shortName}_WorkerInjectorPlugin"
7778
val scope = vmClass.annotations.first { it.fqName == ContributesWorker::class.fqName }.scopeOrNull(0)
@@ -125,7 +126,7 @@ class ContributesWorkerCodeGenerator : CodeGenerator {
125126
)
126127
}
127128

128-
return createGeneratedFile(codeGenDir, generatedPackage, workerPluginName, content)
129+
return createGeneratedFile(codeGenDir, generatedPackage, workerPluginName, content, vmClass.containingFileAsJavaFile)
129130
}
130131

131132
private fun generateCode(

‎versions.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
plugin.android=8.7.3
1111

12-
plugin.com.squareup.anvil=2.5.0
12+
plugin.com.squareup.anvil=2.6.1
1313

1414
plugin.org.jetbrains.dokka=1.8.20
1515

@@ -99,7 +99,7 @@ version.com.nhaarman.mockitokotlin2..mockito-kotlin=2.2.0
9999

100100
version.google.android.material=1.12.0
101101

102-
version.google.dagger=2.51.1
102+
version.google.dagger=2.56.2
103103

104104
version.io.github.pcmind..leveldb=1.2
105105

0 commit comments

Comments
 (0)