Skip to content

Commit 1ed867c

Browse files
committed
Use Metro scope annotations
Remove the local AppScope, ForScope, and SingleIn stubs now that Metro provides the same annotations directly. Update compiler-generated annotation class IDs to emit Metro's AppScope, ForScope, and SingleIn symbols, including the scope constructor argument used by Metro's ForScope and SingleIn annotations. Refresh affected compiler test sources, FIR dumps, and integration imports to reference dev.zacsweers.metro.
1 parent 016671f commit 1ed867c

51 files changed

Lines changed: 62 additions & 80 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

compiler/src/main/kotlin/com/squareup/metro/extensions/ClassIds.kt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ internal object ClassIds {
2424

2525
val INTO_SET = ClassId(FqName("dev.zacsweers.metro"), Name.identifier("IntoSet"))
2626

27-
// Use com.squareup.dagger.ForScope (the project's custom qualifier), NOT
28-
// dev.zacsweers.metro.ForScope. The graph accessor methods use @com.squareup.dagger.ForScope
29-
// to qualify Set<Scoped> multibindings, so the @Binds function must use the same annotation.
30-
val FOR_SCOPE = ClassId(FqName("com.squareup.dagger"), Name.identifier("ForScope"))
27+
val FOR_SCOPE = ClassId(FqName("dev.zacsweers.metro"), Name.identifier("ForScope"))
3128

3229
val SCREEN_ROBOT =
3330
ClassId(FqName("com.squareup.instrumentation.robots"), Name.identifier("ScreenRobot"))
@@ -42,7 +39,7 @@ internal object ClassIds {
4239

4340
val PROVIDES = ClassId(FqName("dev.zacsweers.metro"), Name.identifier("Provides"))
4441

45-
val SINGLE_IN = ClassId(FqName("com.squareup.dagger"), Name.identifier("SingleIn"))
42+
val SINGLE_IN = ClassId(FqName("dev.zacsweers.metro"), Name.identifier("SingleIn"))
4643

4744
val PROVIDER = ClassId(FqName("dev.zacsweers.metro"), Name.identifier("Provider"))
4845

@@ -54,7 +51,7 @@ internal object ClassIds {
5451

5552
val FEATURE_FLAG = ClassId(FqName("com.squareup.featureflags"), Name.identifier("FeatureFlag"))
5653

57-
val APP_SCOPE = ClassId(FqName("com.squareup.dagger"), Name.identifier("AppScope"))
54+
val APP_SCOPE = ClassId(FqName("dev.zacsweers.metro"), Name.identifier("AppScope"))
5855

5956
val DEVELOPMENT_APP_COMPONENT =
6057
ClassId(FqName("com.squareup.development.shell"), Name.identifier("DevelopmentAppComponent"))

compiler/src/main/kotlin/com/squareup/metro/extensions/developmentapp/DevelopmentAppComponentFir.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public class DevelopmentAppComponentFir(session: FirSession) :
205205
annotations +=
206206
buildAnnotationCallWithScope(
207207
ClassIds.SINGLE_IN,
208-
ArgNames.VALUE,
208+
ArgNames.SCOPE,
209209
buildAppScopeClassExpression()!!,
210210
classSymbol,
211211
session,

compiler/src/main/kotlin/com/squareup/metro/extensions/scoped/ContributesMultibindingScopedFir.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ public class ContributesMultibindingScopedFir(session: FirSession) :
256256
annotations +=
257257
buildAnnotationCallWithScope(
258258
ClassIds.FOR_SCOPE,
259-
ArgNames.VALUE,
259+
ArgNames.SCOPE,
260260
scopeArg,
261261
functionSymbol,
262262
session,

compiler/src/main/kotlin/com/squareup/metro/extensions/service/ContributesServiceFir.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ public class ContributesServiceFir(session: FirSession) :
340340
annotations +=
341341
buildAnnotationCallWithScope(
342342
ClassIds.SINGLE_IN,
343-
ArgNames.VALUE,
343+
ArgNames.SCOPE,
344344
scopeArg,
345345
functionSymbol,
346346
session,
@@ -428,7 +428,7 @@ public class ContributesServiceFir(session: FirSession) :
428428
annotations +=
429429
buildAnnotationCallWithScope(
430430
ClassIds.SINGLE_IN,
431-
ArgNames.VALUE,
431+
ArgNames.SCOPE,
432432
scopeArg,
433433
realFnSymbol,
434434
session,

compiler/src/test/resources/box/contributesfeatureflag/dynamicConfigurationFlag.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.test
22

3-
import com.squareup.dagger.AppScope
3+
import dev.zacsweers.metro.AppScope
44
import com.squareup.featureflags.BooleanFeatureFlag
55
import com.squareup.featureflags.FeatureFlag
66
import com.squareup.featureflags.anvil.ContributesDynamicConfigurationFlag

compiler/src/test/resources/box/contributesfeatureflag/multiCompilation.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import com.squareup.featureflags.anvil.Month.April
1010
object LibFeatureFlag : BooleanFeatureFlag("lib-flag-key")
1111

1212
// MODULE: main(lib)
13-
import com.squareup.dagger.AppScope
13+
import dev.zacsweers.metro.AppScope
1414
import com.squareup.featureflags.FeatureFlag
1515

1616
@DependencyGraph(AppScope::class)

compiler/src/test/resources/box/contributesfeatureflag/multipleFlags.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.test
22

3-
import com.squareup.dagger.AppScope
3+
import dev.zacsweers.metro.AppScope
44
import com.squareup.featureflags.BooleanFeatureFlag
55
import com.squareup.featureflags.FeatureFlag
66
import com.squareup.featureflags.StringFeatureFlag

compiler/src/test/resources/box/contributesfeatureflag/singleCompilation.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.test
22

3-
import com.squareup.dagger.AppScope
3+
import dev.zacsweers.metro.AppScope
44
import com.squareup.featureflags.BooleanFeatureFlag
55
import com.squareup.featureflags.FeatureFlag
66
import com.squareup.featureflags.anvil.ContributesFeatureFlag

compiler/src/test/resources/box/contributesmultibindingscoped/excludedScopedBinding.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.test
22

33
import com.squareup.dagger.ContributesMultibindingScoped
4-
import com.squareup.dagger.ForScope
4+
import dev.zacsweers.metro.ForScope
55
import mortar.Scoped
66

77
@Inject

compiler/src/test/resources/box/contributesmultibindingscoped/multiCompilation.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class MyTestClass : Scoped
1010

1111
// MODULE: main(lib)
1212
import mortar.Scoped
13-
import com.squareup.dagger.ForScope
13+
import dev.zacsweers.metro.ForScope
1414

1515
@DependencyGraph(Unit::class)
1616
interface MyGraph {

0 commit comments

Comments
 (0)