Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to dagger 2.50 #830

Merged
merged 15 commits into from
Feb 6, 2024
Merged

Update to dagger 2.50 #830

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
317786d
Update dagger + force later guava version in tests
ZacSweers Dec 25, 2023
d860543
Generate new Dagger createFactoryProvider functions
ZacSweers Dec 25, 2023
d49ce38
Formatting
ZacSweers Dec 25, 2023
dc7f458
Prohibit extension functions for @Binds
ZacSweers Dec 25, 2023
50060e9
Validate providers too
ZacSweers Dec 25, 2023
eabb340
Update dependency guard
ZacSweers Dec 25, 2023
2aab20e
Merge branch 'main' into z/dagger250
ZacSweers Dec 28, 2023
e380f5b
Merge branch 'main' into z/dagger250
ZacSweers Dec 29, 2023
8394af8
Fix bad merge
ZacSweers Dec 29, 2023
a968f00
Merge branch 'main' into z/dagger250
ZacSweers Feb 3, 2024
e1395b6
Update classpaths
ZacSweers Feb 3, 2024
e20667c
Disable KspComponentProcessor in KSP tests
ZacSweers Feb 5, 2024
acef15f
slightly different messages
ZacSweers Feb 5, 2024
22d8373
Merge branch 'main' into z/dagger250
ZacSweers Feb 5, 2024
32e33ca
Merge branch 'main' into z/dagger250
JoelWilcox Feb 6, 2024
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
2 changes: 1 addition & 1 deletion compiler-utils/dependencies/runtimeClasspath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
com.google.dagger:dagger:2.46.1
com.google.dagger:dagger:2.50
com.squareup:kotlinpoet:1.14.2
javax.inject:javax.inject:1
org.jetbrains.intellij.deps:trove4j:1.0.20200330
Expand Down
2 changes: 2 additions & 0 deletions compiler/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ dependencies {

testImplementation(testFixtures(project(":compiler-utils")))
testImplementation(libs.dagger2.compiler)
// Force later guava version for Dagger's needs
testImplementation(libs.guava)
testImplementation(libs.kotlin.annotationProcessingEmbeddable)
testImplementation(libs.kotlin.compileTesting)
testImplementation(libs.kotlin.compileTesting.ksp)
Expand Down
2 changes: 1 addition & 1 deletion compiler/dependencies/runtimeClasspath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
com.google.dagger:dagger:2.46.1
com.google.dagger:dagger:2.50
com.squareup:kotlinpoet-ksp:1.14.2
com.squareup:kotlinpoet:1.14.2
javax.annotation:jsr250-api:1.0
Expand Down
27 changes: 16 additions & 11 deletions compiler/src/main/java/com/squareup/anvil/compiler/codegen/dagger/AssistedFactoryCodeGen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,19 +559,24 @@ object AssistedFactoryCodeGen : AnvilApplicabilityChecker {
.build(),
)
.apply {
fun createFactory(name: String, providerTypeName: ClassName): FunSpec {
return FunSpec.builder(name)
.jvmStatic()
.addTypeVariables(typeParameters)
.addParameter(DELEGATE_FACTORY_NAME, generatedFactoryTypeName)
.returns(providerTypeName.parameterizedBy(baseFactoryTypeName))
.addStatement(
"return %T.create(%T($DELEGATE_FACTORY_NAME))",
InstanceFactory::class,
implParameterizedTypeName,
)
.build()
}
TypeSpec.companionObjectBuilder()
.addFunction(createFactory("create", Provider::class.asClassName()))
// New in Dagger 2.50: factories for dagger.internal.Provider
.addFunction(
FunSpec.builder("create")
.jvmStatic()
.addTypeVariables(typeParameters)
.addParameter(DELEGATE_FACTORY_NAME, generatedFactoryTypeName)
.returns(Provider::class.asClassName().parameterizedBy(baseFactoryTypeName))
.addStatement(
"return %T.create(%T($DELEGATE_FACTORY_NAME))",
InstanceFactory::class,
implParameterizedTypeName,
)
.build(),
createFactory("createFactoryProvider", dagger.internal.Provider::class.asClassName()),
Comment on lines +575 to +578
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does Dagger always generate both now? Or are they keying off anything to decide on one vs the other? Looks like all the tests passed so it should be fine, but it feels a little surprising

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It always generates both now. The original for backward compatibility, the new one for forward compatibility. They're going to support both going forward

)
.build()
.let {
Expand Down
10 changes: 8 additions & 2 deletions compiler/src/main/java/com/squareup/anvil/compiler/codegen/dagger/BindsMethodValidator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,15 @@ internal class BindsMethodValidator : PrivateCodeGenerator() {
)
}

if (function.function.isExtensionDeclaration()) {
throw AnvilCompilationExceptionFunctionReference(
message = "@Binds methods can not be an extension function",
functionReference = function,
)
}

val hasSingleBindingParameter =
(function.parameters.size == 1 && !function.function.isExtensionDeclaration()) ||
(function.parameters.isEmpty() && function.function.isExtensionDeclaration())
function.parameters.size == 1 && !function.function.isExtensionDeclaration()
if (!hasSingleBindingParameter) {
throw AnvilCompilationExceptionFunctionReference(
message = "@Binds methods must have exactly one parameter, " +
Expand Down
13 changes: 13 additions & 0 deletions .../src/main/java/com/squareup/anvil/compiler/codegen/dagger/ProvidesMethodFactoryCodeGen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ import dagger.internal.Factory
import dagger.internal.Preconditions
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.psiUtil.isExtensionDeclaration
import java.io.File

object ProvidesMethodFactoryCodeGen : AnvilApplicabilityChecker {
Expand Down Expand Up @@ -151,6 +152,12 @@ object ProvidesMethodFactoryCodeGen : AnvilApplicabilityChecker {
}

private fun CallableReference.Companion.from(function: KSFunctionDeclaration): CallableReference {
if (function.extensionReceiver != null) {
throw KspAnvilException(
message = "@Provides methods cannot be extension functions",
node = function,
)
}
val type = function.returnType?.resolve() ?: throw KspAnvilException(
message = "Error occurred in type resolution and could not resolve return type.",
node = function,
Expand Down Expand Up @@ -281,6 +288,12 @@ object ProvidesMethodFactoryCodeGen : AnvilApplicabilityChecker {
}

private fun CallableReference.Companion.from(function: MemberFunctionReference.Psi): CallableReference {
if (function.function.isExtensionDeclaration()) {
throw AnvilCompilationExceptionFunctionReference(
message = "@Provides methods can not be an extension function",
functionReference = function,
)
}
val type = function.returnTypeOrNull() ?: throw AnvilCompilationExceptionFunctionReference(
message = "Dagger provider methods must specify the return type explicitly when using " +
"Anvil. The return type cannot be inferred implicitly.",
Expand Down
Loading