Skip to content

Commit d10bccb

Browse files
vRallevvRallev
committed
Upgrade Metro to 0.13.0
Adapt metro-extensions to Metro 0.13.0's compiler SPI changes. Metro now passes `CompatContext` into FIR extension factories and a `MetroFirTypeResolver.Factory` into `MetroContributionExtension` lookups. Update all public extension entry points to match the new signatures and refresh the checked-in compiler API dump.
1 parent ad93eb9 commit d10bccb

13 files changed

Lines changed: 73 additions & 27 deletions

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
### Changed
88

9+
- Upgrade Metro to `0.13.0` and adapt to Metro's updated compiler extension SPI.
10+
911
### Deprecated
1012

1113
### Removed

‎compiler/api/compiler.api‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@ public final class com/squareup/metro/extensions/developmentapp/DevelopmentAppCo
3131

3232
public final class com/squareup/metro/extensions/developmentapp/DevelopmentAppComponentFir$Factory : dev/zacsweers/metro/compiler/api/fir/MetroFirDeclarationGenerationExtension$Factory {
3333
public fun <init> ()V
34-
public fun create (Lorg/jetbrains/kotlin/fir/FirSession;Ldev/zacsweers/metro/compiler/MetroOptions;)Ldev/zacsweers/metro/compiler/api/fir/MetroFirDeclarationGenerationExtension;
34+
public fun create (Lorg/jetbrains/kotlin/fir/FirSession;Ldev/zacsweers/metro/compiler/MetroOptions;Ldev/zacsweers/metro/compiler/compat/CompatContext;)Ldev/zacsweers/metro/compiler/api/fir/MetroFirDeclarationGenerationExtension;
3535
}
3636

3737
public final class com/squareup/metro/extensions/developmentapp/DevelopmentAppComponentMetroExtension : dev/zacsweers/metro/compiler/api/fir/MetroContributionExtension {
3838
public fun <init> (Lorg/jetbrains/kotlin/fir/FirSession;)V
39-
public fun getContributions (Lorg/jetbrains/kotlin/name/ClassId;)Ljava/util/List;
39+
public fun getContributions (Lorg/jetbrains/kotlin/name/ClassId;Ldev/zacsweers/metro/compiler/fir/MetroFirTypeResolver$Factory;)Ljava/util/List;
4040
public fun registerPredicates (Lorg/jetbrains/kotlin/fir/extensions/FirDeclarationPredicateRegistrar;)V
4141
}
4242

4343
public final class com/squareup/metro/extensions/developmentapp/DevelopmentAppComponentMetroExtension$Factory : dev/zacsweers/metro/compiler/api/fir/MetroContributionExtension$Factory {
4444
public fun <init> ()V
45-
public fun create (Lorg/jetbrains/kotlin/fir/FirSession;Ldev/zacsweers/metro/compiler/MetroOptions;)Ldev/zacsweers/metro/compiler/api/fir/MetroContributionExtension;
45+
public fun create (Lorg/jetbrains/kotlin/fir/FirSession;Ldev/zacsweers/metro/compiler/MetroOptions;Ldev/zacsweers/metro/compiler/compat/CompatContext;)Ldev/zacsweers/metro/compiler/api/fir/MetroContributionExtension;
4646
}
4747

4848
public final class com/squareup/metro/extensions/featureflag/ContributesFeatureFlagFir : dev/zacsweers/metro/compiler/api/fir/MetroFirDeclarationGenerationExtension {
@@ -55,18 +55,18 @@ public final class com/squareup/metro/extensions/featureflag/ContributesFeatureF
5555

5656
public final class com/squareup/metro/extensions/featureflag/ContributesFeatureFlagFir$Factory : dev/zacsweers/metro/compiler/api/fir/MetroFirDeclarationGenerationExtension$Factory {
5757
public fun <init> ()V
58-
public fun create (Lorg/jetbrains/kotlin/fir/FirSession;Ldev/zacsweers/metro/compiler/MetroOptions;)Ldev/zacsweers/metro/compiler/api/fir/MetroFirDeclarationGenerationExtension;
58+
public fun create (Lorg/jetbrains/kotlin/fir/FirSession;Ldev/zacsweers/metro/compiler/MetroOptions;Ldev/zacsweers/metro/compiler/compat/CompatContext;)Ldev/zacsweers/metro/compiler/api/fir/MetroFirDeclarationGenerationExtension;
5959
}
6060

6161
public final class com/squareup/metro/extensions/featureflag/ContributesFeatureFlagMetroExtension : dev/zacsweers/metro/compiler/api/fir/MetroContributionExtension {
6262
public fun <init> (Lorg/jetbrains/kotlin/fir/FirSession;)V
63-
public fun getContributions (Lorg/jetbrains/kotlin/name/ClassId;)Ljava/util/List;
63+
public fun getContributions (Lorg/jetbrains/kotlin/name/ClassId;Ldev/zacsweers/metro/compiler/fir/MetroFirTypeResolver$Factory;)Ljava/util/List;
6464
public fun registerPredicates (Lorg/jetbrains/kotlin/fir/extensions/FirDeclarationPredicateRegistrar;)V
6565
}
6666

6767
public final class com/squareup/metro/extensions/featureflag/ContributesFeatureFlagMetroExtension$Factory : dev/zacsweers/metro/compiler/api/fir/MetroContributionExtension$Factory {
6868
public fun <init> ()V
69-
public fun create (Lorg/jetbrains/kotlin/fir/FirSession;Ldev/zacsweers/metro/compiler/MetroOptions;)Ldev/zacsweers/metro/compiler/api/fir/MetroContributionExtension;
69+
public fun create (Lorg/jetbrains/kotlin/fir/FirSession;Ldev/zacsweers/metro/compiler/MetroOptions;Ldev/zacsweers/metro/compiler/compat/CompatContext;)Ldev/zacsweers/metro/compiler/api/fir/MetroContributionExtension;
7070
}
7171

7272
public final class com/squareup/metro/extensions/robot/ContributesRobotFir : dev/zacsweers/metro/compiler/api/fir/MetroFirDeclarationGenerationExtension {
@@ -81,18 +81,18 @@ public final class com/squareup/metro/extensions/robot/ContributesRobotFir : dev
8181

8282
public final class com/squareup/metro/extensions/robot/ContributesRobotFir$Factory : dev/zacsweers/metro/compiler/api/fir/MetroFirDeclarationGenerationExtension$Factory {
8383
public fun <init> ()V
84-
public fun create (Lorg/jetbrains/kotlin/fir/FirSession;Ldev/zacsweers/metro/compiler/MetroOptions;)Ldev/zacsweers/metro/compiler/api/fir/MetroFirDeclarationGenerationExtension;
84+
public fun create (Lorg/jetbrains/kotlin/fir/FirSession;Ldev/zacsweers/metro/compiler/MetroOptions;Ldev/zacsweers/metro/compiler/compat/CompatContext;)Ldev/zacsweers/metro/compiler/api/fir/MetroFirDeclarationGenerationExtension;
8585
}
8686

8787
public final class com/squareup/metro/extensions/robot/ContributesRobotMetroExtension : dev/zacsweers/metro/compiler/api/fir/MetroContributionExtension {
8888
public fun <init> (Lorg/jetbrains/kotlin/fir/FirSession;)V
89-
public fun getContributions (Lorg/jetbrains/kotlin/name/ClassId;)Ljava/util/List;
89+
public fun getContributions (Lorg/jetbrains/kotlin/name/ClassId;Ldev/zacsweers/metro/compiler/fir/MetroFirTypeResolver$Factory;)Ljava/util/List;
9090
public fun registerPredicates (Lorg/jetbrains/kotlin/fir/extensions/FirDeclarationPredicateRegistrar;)V
9191
}
9292

9393
public final class com/squareup/metro/extensions/robot/ContributesRobotMetroExtension$Factory : dev/zacsweers/metro/compiler/api/fir/MetroContributionExtension$Factory {
9494
public fun <init> ()V
95-
public fun create (Lorg/jetbrains/kotlin/fir/FirSession;Ldev/zacsweers/metro/compiler/MetroOptions;)Ldev/zacsweers/metro/compiler/api/fir/MetroContributionExtension;
95+
public fun create (Lorg/jetbrains/kotlin/fir/FirSession;Ldev/zacsweers/metro/compiler/MetroOptions;Ldev/zacsweers/metro/compiler/compat/CompatContext;)Ldev/zacsweers/metro/compiler/api/fir/MetroContributionExtension;
9696
}
9797

9898
public final class com/squareup/metro/extensions/scoped/ContributesMultibindingScopedFir : dev/zacsweers/metro/compiler/api/fir/MetroFirDeclarationGenerationExtension {
@@ -105,18 +105,18 @@ public final class com/squareup/metro/extensions/scoped/ContributesMultibindingS
105105

106106
public final class com/squareup/metro/extensions/scoped/ContributesMultibindingScopedFir$Factory : dev/zacsweers/metro/compiler/api/fir/MetroFirDeclarationGenerationExtension$Factory {
107107
public fun <init> ()V
108-
public fun create (Lorg/jetbrains/kotlin/fir/FirSession;Ldev/zacsweers/metro/compiler/MetroOptions;)Ldev/zacsweers/metro/compiler/api/fir/MetroFirDeclarationGenerationExtension;
108+
public fun create (Lorg/jetbrains/kotlin/fir/FirSession;Ldev/zacsweers/metro/compiler/MetroOptions;Ldev/zacsweers/metro/compiler/compat/CompatContext;)Ldev/zacsweers/metro/compiler/api/fir/MetroFirDeclarationGenerationExtension;
109109
}
110110

111111
public final class com/squareup/metro/extensions/scoped/ContributesMultibindingScopedMetroExtension : dev/zacsweers/metro/compiler/api/fir/MetroContributionExtension {
112112
public fun <init> (Lorg/jetbrains/kotlin/fir/FirSession;)V
113-
public fun getContributions (Lorg/jetbrains/kotlin/name/ClassId;)Ljava/util/List;
113+
public fun getContributions (Lorg/jetbrains/kotlin/name/ClassId;Ldev/zacsweers/metro/compiler/fir/MetroFirTypeResolver$Factory;)Ljava/util/List;
114114
public fun registerPredicates (Lorg/jetbrains/kotlin/fir/extensions/FirDeclarationPredicateRegistrar;)V
115115
}
116116

117117
public final class com/squareup/metro/extensions/scoped/ContributesMultibindingScopedMetroExtension$Factory : dev/zacsweers/metro/compiler/api/fir/MetroContributionExtension$Factory {
118118
public fun <init> ()V
119-
public fun create (Lorg/jetbrains/kotlin/fir/FirSession;Ldev/zacsweers/metro/compiler/MetroOptions;)Ldev/zacsweers/metro/compiler/api/fir/MetroContributionExtension;
119+
public fun create (Lorg/jetbrains/kotlin/fir/FirSession;Ldev/zacsweers/metro/compiler/MetroOptions;Ldev/zacsweers/metro/compiler/compat/CompatContext;)Ldev/zacsweers/metro/compiler/api/fir/MetroContributionExtension;
120120
}
121121

122122
public final class com/squareup/metro/extensions/service/ContributesServiceFir : dev/zacsweers/metro/compiler/api/fir/MetroFirDeclarationGenerationExtension {
@@ -129,17 +129,17 @@ public final class com/squareup/metro/extensions/service/ContributesServiceFir :
129129

130130
public final class com/squareup/metro/extensions/service/ContributesServiceFir$Factory : dev/zacsweers/metro/compiler/api/fir/MetroFirDeclarationGenerationExtension$Factory {
131131
public fun <init> ()V
132-
public fun create (Lorg/jetbrains/kotlin/fir/FirSession;Ldev/zacsweers/metro/compiler/MetroOptions;)Ldev/zacsweers/metro/compiler/api/fir/MetroFirDeclarationGenerationExtension;
132+
public fun create (Lorg/jetbrains/kotlin/fir/FirSession;Ldev/zacsweers/metro/compiler/MetroOptions;Ldev/zacsweers/metro/compiler/compat/CompatContext;)Ldev/zacsweers/metro/compiler/api/fir/MetroFirDeclarationGenerationExtension;
133133
}
134134

135135
public final class com/squareup/metro/extensions/service/ContributesServiceMetroExtension : dev/zacsweers/metro/compiler/api/fir/MetroContributionExtension {
136136
public fun <init> (Lorg/jetbrains/kotlin/fir/FirSession;)V
137-
public fun getContributions (Lorg/jetbrains/kotlin/name/ClassId;)Ljava/util/List;
137+
public fun getContributions (Lorg/jetbrains/kotlin/name/ClassId;Ldev/zacsweers/metro/compiler/fir/MetroFirTypeResolver$Factory;)Ljava/util/List;
138138
public fun registerPredicates (Lorg/jetbrains/kotlin/fir/extensions/FirDeclarationPredicateRegistrar;)V
139139
}
140140

141141
public final class com/squareup/metro/extensions/service/ContributesServiceMetroExtension$Factory : dev/zacsweers/metro/compiler/api/fir/MetroContributionExtension$Factory {
142142
public fun <init> ()V
143-
public fun create (Lorg/jetbrains/kotlin/fir/FirSession;Ldev/zacsweers/metro/compiler/MetroOptions;)Ldev/zacsweers/metro/compiler/api/fir/MetroContributionExtension;
143+
public fun create (Lorg/jetbrains/kotlin/fir/FirSession;Ldev/zacsweers/metro/compiler/MetroOptions;Ldev/zacsweers/metro/compiler/compat/CompatContext;)Ldev/zacsweers/metro/compiler/api/fir/MetroContributionExtension;
144144
}
145145

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import com.squareup.metro.extensions.fir.hasAnnotation
1010
import com.squareup.metro.extensions.squareMetroExtensionsConfig
1111
import dev.zacsweers.metro.compiler.MetroOptions
1212
import dev.zacsweers.metro.compiler.api.fir.MetroFirDeclarationGenerationExtension
13+
import dev.zacsweers.metro.compiler.compat.CompatContext
1314
import org.jetbrains.kotlin.descriptors.ClassKind
1415
import org.jetbrains.kotlin.descriptors.Modality
1516
import org.jetbrains.kotlin.descriptors.Visibilities
@@ -928,6 +929,7 @@ public class DevelopmentAppComponentFir(session: FirSession) :
928929
override fun create(
929930
session: FirSession,
930931
options: MetroOptions,
932+
compatContext: CompatContext,
931933
): MetroFirDeclarationGenerationExtension = DevelopmentAppComponentFir(session)
932934
}
933935
}

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import com.squareup.metro.extensions.ClassIds
55
import com.squareup.metro.extensions.fir.findAnnotation
66
import dev.zacsweers.metro.compiler.MetroOptions
77
import dev.zacsweers.metro.compiler.api.fir.MetroContributionExtension
8+
import dev.zacsweers.metro.compiler.compat.CompatContext
9+
import dev.zacsweers.metro.compiler.fir.MetroFirTypeResolver
810
import org.jetbrains.kotlin.fir.FirSession
911
import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
1012
import org.jetbrains.kotlin.fir.expressions.FirGetClassCall
@@ -46,7 +48,8 @@ public class DevelopmentAppComponentMetroExtension(private val session: FirSessi
4648
}
4749

4850
override fun getContributions(
49-
scopeClassId: ClassId
51+
scopeClassId: ClassId,
52+
typeResolverFactory: MetroFirTypeResolver.Factory,
5053
): List<MetroContributionExtension.Contribution> {
5154
return annotatedClasses.flatMap { classSymbol ->
5255
val featureScopeId =
@@ -147,7 +150,10 @@ public class DevelopmentAppComponentMetroExtension(private val session: FirSessi
147150

148151
@AutoService(MetroContributionExtension.Factory::class)
149152
public class Factory : MetroContributionExtension.Factory {
150-
override fun create(session: FirSession, options: MetroOptions): MetroContributionExtension =
151-
DevelopmentAppComponentMetroExtension(session)
153+
override fun create(
154+
session: FirSession,
155+
options: MetroOptions,
156+
compatContext: CompatContext,
157+
): MetroContributionExtension = DevelopmentAppComponentMetroExtension(session)
152158
}
153159
}

‎compiler/src/main/kotlin/com/squareup/metro/extensions/featureflag/ContributesFeatureFlagFir.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import com.squareup.metro.extensions.fir.buildClassExpression
99
import com.squareup.metro.extensions.fir.hasAnnotation
1010
import dev.zacsweers.metro.compiler.MetroOptions
1111
import dev.zacsweers.metro.compiler.api.fir.MetroFirDeclarationGenerationExtension
12+
import dev.zacsweers.metro.compiler.compat.CompatContext
1213
import org.jetbrains.kotlin.descriptors.ClassKind
1314
import org.jetbrains.kotlin.descriptors.Modality
1415
import org.jetbrains.kotlin.descriptors.Visibilities
@@ -290,6 +291,7 @@ public class ContributesFeatureFlagFir(session: FirSession) :
290291
override fun create(
291292
session: FirSession,
292293
options: MetroOptions,
294+
compatContext: CompatContext,
293295
): MetroFirDeclarationGenerationExtension = ContributesFeatureFlagFir(session)
294296
}
295297
}

‎compiler/src/main/kotlin/com/squareup/metro/extensions/featureflag/ContributesFeatureFlagMetroExtension.kt‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import com.squareup.metro.extensions.ClassIds
55
import com.squareup.metro.extensions.fir.hasAnnotation
66
import dev.zacsweers.metro.compiler.MetroOptions
77
import dev.zacsweers.metro.compiler.api.fir.MetroContributionExtension
8+
import dev.zacsweers.metro.compiler.compat.CompatContext
9+
import dev.zacsweers.metro.compiler.fir.MetroFirTypeResolver
810
import org.jetbrains.kotlin.fir.FirSession
911
import org.jetbrains.kotlin.fir.extensions.FirDeclarationPredicateRegistrar
1012
import org.jetbrains.kotlin.fir.extensions.predicateBasedProvider
@@ -44,7 +46,8 @@ public class ContributesFeatureFlagMetroExtension(private val session: FirSessio
4446
}
4547

4648
override fun getContributions(
47-
scopeClassId: ClassId
49+
scopeClassId: ClassId,
50+
typeResolverFactory: MetroFirTypeResolver.Factory,
4851
): List<MetroContributionExtension.Contribution> {
4952
// Feature flags are always contributed to AppScope.
5053
if (scopeClassId != ClassIds.APP_SCOPE) return emptyList()
@@ -88,7 +91,11 @@ public class ContributesFeatureFlagMetroExtension(private val session: FirSessio
8891

8992
@AutoService(MetroContributionExtension.Factory::class)
9093
public class Factory : MetroContributionExtension.Factory {
91-
override fun create(session: FirSession, options: MetroOptions): MetroContributionExtension {
94+
override fun create(
95+
session: FirSession,
96+
options: MetroOptions,
97+
compatContext: CompatContext,
98+
): MetroContributionExtension {
9299
return ContributesFeatureFlagMetroExtension(session)
93100
}
94101
}

‎compiler/src/main/kotlin/com/squareup/metro/extensions/robot/ContributesRobotFir.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import com.squareup.metro.extensions.fir.extractScopeClassId
1111
import com.squareup.metro.extensions.fir.hasAnnotation
1212
import dev.zacsweers.metro.compiler.MetroOptions
1313
import dev.zacsweers.metro.compiler.api.fir.MetroFirDeclarationGenerationExtension
14+
import dev.zacsweers.metro.compiler.compat.CompatContext
1415
import org.jetbrains.kotlin.descriptors.ClassKind
1516
import org.jetbrains.kotlin.descriptors.Modality
1617
import org.jetbrains.kotlin.descriptors.Visibilities
@@ -226,6 +227,7 @@ public class ContributesRobotFir(session: FirSession) :
226227
override fun create(
227228
session: FirSession,
228229
options: MetroOptions,
230+
compatContext: CompatContext,
229231
): MetroFirDeclarationGenerationExtension = ContributesRobotFir(session)
230232
}
231233
}

‎compiler/src/main/kotlin/com/squareup/metro/extensions/robot/ContributesRobotMetroExtension.kt‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import com.fueledbycaffeine.autoservice.AutoService
44
import com.squareup.metro.extensions.fir.extractScopeClassId
55
import dev.zacsweers.metro.compiler.MetroOptions
66
import dev.zacsweers.metro.compiler.api.fir.MetroContributionExtension
7+
import dev.zacsweers.metro.compiler.compat.CompatContext
8+
import dev.zacsweers.metro.compiler.fir.MetroFirTypeResolver
79
import org.jetbrains.kotlin.fir.FirSession
810
import org.jetbrains.kotlin.fir.extensions.FirDeclarationPredicateRegistrar
911
import org.jetbrains.kotlin.fir.extensions.predicateBasedProvider
@@ -40,7 +42,8 @@ public class ContributesRobotMetroExtension(private val session: FirSession) :
4042
}
4143

4244
override fun getContributions(
43-
scopeClassId: ClassId
45+
scopeClassId: ClassId,
46+
typeResolverFactory: MetroFirTypeResolver.Factory,
4447
): List<MetroContributionExtension.Contribution> {
4548
return annotatedClasses.mapNotNull { parentSymbol ->
4649
val annotationScopeClassId =
@@ -76,7 +79,11 @@ public class ContributesRobotMetroExtension(private val session: FirSession) :
7679

7780
@AutoService(MetroContributionExtension.Factory::class)
7881
public class Factory : MetroContributionExtension.Factory {
79-
override fun create(session: FirSession, options: MetroOptions): MetroContributionExtension {
82+
override fun create(
83+
session: FirSession,
84+
options: MetroOptions,
85+
compatContext: CompatContext,
86+
): MetroContributionExtension {
8087
return ContributesRobotMetroExtension(session)
8188
}
8289
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import com.squareup.metro.extensions.fir.extractScopeClassId
1111
import com.squareup.metro.extensions.fir.hasAnnotation
1212
import dev.zacsweers.metro.compiler.MetroOptions
1313
import dev.zacsweers.metro.compiler.api.fir.MetroFirDeclarationGenerationExtension
14+
import dev.zacsweers.metro.compiler.compat.CompatContext
1415
import org.jetbrains.kotlin.descriptors.ClassKind
1516
import org.jetbrains.kotlin.descriptors.Modality
1617
import org.jetbrains.kotlin.descriptors.Visibilities
@@ -301,6 +302,7 @@ public class ContributesMultibindingScopedFir(session: FirSession) :
301302
override fun create(
302303
session: FirSession,
303304
options: MetroOptions,
305+
compatContext: CompatContext,
304306
): MetroFirDeclarationGenerationExtension = ContributesMultibindingScopedFir(session)
305307
}
306308
}

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import com.fueledbycaffeine.autoservice.AutoService
44
import com.squareup.metro.extensions.fir.extractScopeClassId
55
import dev.zacsweers.metro.compiler.MetroOptions
66
import dev.zacsweers.metro.compiler.api.fir.MetroContributionExtension
7+
import dev.zacsweers.metro.compiler.compat.CompatContext
8+
import dev.zacsweers.metro.compiler.fir.MetroFirTypeResolver
79
import org.jetbrains.kotlin.fir.FirSession
810
import org.jetbrains.kotlin.fir.extensions.FirDeclarationPredicateRegistrar
911
import org.jetbrains.kotlin.fir.extensions.predicateBasedProvider
@@ -41,7 +43,8 @@ public class ContributesMultibindingScopedMetroExtension(private val session: Fi
4143
}
4244

4345
override fun getContributions(
44-
scopeClassId: ClassId
46+
scopeClassId: ClassId,
47+
typeResolverFactory: MetroFirTypeResolver.Factory,
4548
): List<MetroContributionExtension.Contribution> {
4649
return annotatedClasses.mapNotNull { parentSymbol ->
4750
val annotationScopeClassId =
@@ -82,7 +85,11 @@ public class ContributesMultibindingScopedMetroExtension(private val session: Fi
8285

8386
@AutoService(MetroContributionExtension.Factory::class)
8487
public class Factory : MetroContributionExtension.Factory {
85-
override fun create(session: FirSession, options: MetroOptions): MetroContributionExtension {
88+
override fun create(
89+
session: FirSession,
90+
options: MetroOptions,
91+
compatContext: CompatContext,
92+
): MetroContributionExtension {
8693
return ContributesMultibindingScopedMetroExtension(session)
8794
}
8895
}

0 commit comments

Comments
 (0)