Skip to content

Commit cfd63e6

Browse files
BoDBoD
authored
Add generateApolloProjectIdeModel task (#6666)
* Add generateIdeModel tasks * Rename ProjectIdeModel -> ProjectModel, and ServiceIdeModel -> ServiceModel * Don't manually wire output files * Add telemetry info to project and service models * Move ProjectModel, ServiceModel to :apollo-tooling * Fix API Dump * @ApolloInternal -> @ApolloExperimental and renames * Revert @ApolloInternal -> @ApolloExperimental * Rename ServiceModel to CompilationUnitModel and move it and ProjectModel to apollo-compiler. Keep telemetry data in apollo-tooling. * Expose compiler plugin dependencies in ServiceModel + expose apolloCompilerRegistry (#6672) * Expose compiler plugin dependencies * Make EntryPoints APIs take plugins as argument * Keep DefaultApolloCompilerRegistry internal * Move loadCompilerPlugins to apollo-gradle-plugin-tasks, and keep arguments/logger arguments * Add pluginArguments to CompilationUnitModel * Don't make toAny public, in fact remove it since it's unused.
1 parent 7673134 commit cfd63e6

File tree

19 files changed

+509
-106
lines changed

19 files changed

+509
-106
lines changed

‎libraries/apollo-compiler/api/apollo-compiler.api‎

Lines changed: 66 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,11 @@ public abstract interface class com/apollographql/apollo/compiler/DocumentTransf
209209

210210
public final class com/apollographql/apollo/compiler/EntryPoints {
211211
public static final field INSTANCE Lcom/apollographql/apollo/compiler/EntryPoints;
212-
public final fun buildCodegenSchema (Ljava/util/Map;Lcom/apollographql/apollo/compiler/ApolloCompiler$Logger;ZLjava/util/List;Ljava/io/File;Ljava/io/File;)V
213-
public final fun buildDataBuilders (Ljava/util/Map;Lcom/apollographql/apollo/compiler/ApolloCompiler$Logger;ZLjava/util/List;Ljava/util/List;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V
214-
public final fun buildIr (Ljava/util/Map;Lcom/apollographql/apollo/compiler/ApolloCompiler$Logger;ZLjava/util/List;Ljava/util/List;Ljava/util/List;Ljava/io/File;Ljava/io/File;)V
215-
public final fun buildSources (Ljava/util/Map;Lcom/apollographql/apollo/compiler/ApolloCompiler$Logger;ZLjava/util/List;Ljava/util/List;Ljava/io/File;Ljava/io/File;Ljava/io/File;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V
216-
public final fun buildSourcesFromIr (Ljava/util/Map;Lcom/apollographql/apollo/compiler/ApolloCompiler$Logger;ZLjava/util/List;Ljava/util/List;Ljava/io/File;Ljava/io/File;Ljava/io/File;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V
212+
public final fun buildCodegenSchema (Ljava/util/List;Ljava/util/Map;Lcom/apollographql/apollo/compiler/ApolloCompiler$Logger;Ljava/util/List;Ljava/io/File;Ljava/io/File;)V
213+
public final fun buildDataBuilders (Ljava/util/List;Ljava/util/Map;Lcom/apollographql/apollo/compiler/ApolloCompiler$Logger;Ljava/util/List;Ljava/util/List;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V
214+
public final fun buildIr (Ljava/util/List;Ljava/util/Map;Lcom/apollographql/apollo/compiler/ApolloCompiler$Logger;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/io/File;Ljava/io/File;)V
215+
public final fun buildSources (Ljava/util/List;Ljava/util/Map;Lcom/apollographql/apollo/compiler/ApolloCompiler$Logger;Ljava/util/List;Ljava/util/List;Ljava/io/File;Ljava/io/File;Ljava/io/File;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V
216+
public final fun buildSourcesFromIr (Ljava/util/List;Ljava/util/Map;Lcom/apollographql/apollo/compiler/ApolloCompiler$Logger;Ljava/util/List;Ljava/util/List;Ljava/io/File;Ljava/io/File;Ljava/io/File;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V
217217
}
218218

219219
public final class com/apollographql/apollo/compiler/EntrypointsKt {
@@ -1948,6 +1948,67 @@ public final class com/apollographql/apollo/compiler/ir/IrVariable$Companion {
19481948
public final fun serializer ()Lkotlinx/serialization/KSerializer;
19491949
}
19501950

1951+
public final class com/apollographql/apollo/compiler/model/CompilationUnitModel {
1952+
public static final field Companion Lcom/apollographql/apollo/compiler/model/CompilationUnitModel$Companion;
1953+
public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/lang/String;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;)V
1954+
public final fun getDownstreamGradleProjectPaths ()Ljava/util/Set;
1955+
public final fun getEndpointHeaders ()Ljava/util/Map;
1956+
public final fun getEndpointUrl ()Ljava/lang/String;
1957+
public final fun getGradleProjectPath ()Ljava/lang/String;
1958+
public final fun getGraphqlSrcDirs ()Ljava/util/Set;
1959+
public final fun getPluginArguments ()Ljava/util/Map;
1960+
public final fun getPluginDependencies ()Ljava/util/Set;
1961+
public final fun getSchemaFiles ()Ljava/util/Set;
1962+
public final fun getServiceName ()Ljava/lang/String;
1963+
public final fun getUpstreamGradleProjectPaths ()Ljava/util/Set;
1964+
}
1965+
1966+
public final class com/apollographql/apollo/compiler/model/CompilationUnitModel$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
1967+
public static final field INSTANCE Lcom/apollographql/apollo/compiler/model/CompilationUnitModel$$serializer;
1968+
public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
1969+
public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/apollographql/apollo/compiler/model/CompilationUnitModel;
1970+
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
1971+
public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
1972+
public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/apollographql/apollo/compiler/model/CompilationUnitModel;)V
1973+
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
1974+
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
1975+
}
1976+
1977+
public final class com/apollographql/apollo/compiler/model/CompilationUnitModel$Companion {
1978+
public final fun serializer ()Lkotlinx/serialization/KSerializer;
1979+
}
1980+
1981+
public final class com/apollographql/apollo/compiler/model/CompilationUnitModelKt {
1982+
public static final fun toCompilationUnitModel (Ljava/io/File;)Lcom/apollographql/apollo/compiler/model/CompilationUnitModel;
1983+
public static final fun writeTo (Lcom/apollographql/apollo/compiler/model/CompilationUnitModel;Ljava/io/File;)V
1984+
}
1985+
1986+
public final class com/apollographql/apollo/compiler/model/ProjectModel {
1987+
public static final field Companion Lcom/apollographql/apollo/compiler/model/ProjectModel$Companion;
1988+
public fun <init> (Ljava/util/Set;)V
1989+
public final fun getServiceNames ()Ljava/util/Set;
1990+
}
1991+
1992+
public final class com/apollographql/apollo/compiler/model/ProjectModel$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
1993+
public static final field INSTANCE Lcom/apollographql/apollo/compiler/model/ProjectModel$$serializer;
1994+
public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
1995+
public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/apollographql/apollo/compiler/model/ProjectModel;
1996+
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
1997+
public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
1998+
public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/apollographql/apollo/compiler/model/ProjectModel;)V
1999+
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
2000+
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
2001+
}
2002+
2003+
public final class com/apollographql/apollo/compiler/model/ProjectModel$Companion {
2004+
public final fun serializer ()Lkotlinx/serialization/KSerializer;
2005+
}
2006+
2007+
public final class com/apollographql/apollo/compiler/model/ProjectModelKt {
2008+
public static final fun toProjectModel (Ljava/io/File;)Lcom/apollographql/apollo/compiler/model/ProjectModel;
2009+
public static final fun writeTo (Lcom/apollographql/apollo/compiler/model/ProjectModel;Ljava/io/File;)V
2010+
}
2011+
19512012
public final class com/apollographql/apollo/compiler/operationoutput/OperationDescriptor {
19522013
public static final field Companion Lcom/apollographql/apollo/compiler/operationoutput/OperationDescriptor$Companion;
19532014
public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V

‎libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo/compiler/entrypoints.kt‎

Lines changed: 24 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import com.apollographql.apollo.compiler.ApolloCompiler.buildSchemaAndOperations
66
import com.apollographql.apollo.compiler.codegen.writeTo
77
import com.apollographql.apollo.compiler.internal.DefaultApolloCompilerRegistry
88
import java.io.File
9-
import java.util.ServiceLoader
109

1110
/**
1211
* EntryPoints is a higher level API compared to [ApolloCompiler].
@@ -15,17 +14,17 @@ import java.util.ServiceLoader
1514
@ApolloInternal
1615
object EntryPoints {
1716
fun buildCodegenSchema(
17+
plugins: List<ApolloCompilerPlugin>,
1818
arguments: Map<String, Any?>,
1919
logger: ApolloCompiler.Logger,
20-
warnIfNotFound: Boolean,
2120
normalizedSchemaFiles: List<InputFile>,
2221
codegenSchemaOptionsFile: File,
2322
codegenSchemaFile: File,
2423
) {
2524
val registry = apolloCompilerRegistry(
2625
arguments = arguments,
2726
logger = logger,
28-
warnIfNotFound = warnIfNotFound,
27+
plugins = plugins,
2928
)
3029

3130
ApolloCompiler.buildCodegenSchema(
@@ -38,16 +37,20 @@ object EntryPoints {
3837
}
3938

4039
fun buildIr(
40+
plugins: List<ApolloCompilerPlugin>,
4141
arguments: Map<String, Any?>,
4242
logger: ApolloCompiler.Logger,
43-
warnIfNotFound: Boolean,
4443
graphqlFiles: List<InputFile>,
4544
codegenSchemaFiles: List<InputFile>,
4645
upstreamIrOperations: List<InputFile>,
4746
irOptionsFile: File,
4847
irOperationsFile: File,
4948
) {
50-
val registry = apolloCompilerRegistry(arguments, logger, warnIfNotFound)
49+
val registry = apolloCompilerRegistry(
50+
arguments = arguments,
51+
logger = logger,
52+
plugins = plugins,
53+
)
5154

5255
val upstream = upstreamIrOperations.map { it.file.toIrOperations() }
5356
buildIrOperations(
@@ -62,22 +65,22 @@ object EntryPoints {
6265
}
6366

6467
fun buildSourcesFromIr(
68+
plugins: List<ApolloCompilerPlugin>,
6569
arguments: Map<String, Any?>,
6670
logger: ApolloCompiler.Logger,
67-
warnIfNotFound: Boolean,
6871
codegenSchemas: List<InputFile>,
6972
upstreamMetadata: List<InputFile>,
7073
irOperations: File,
7174
usedCoordinates: File,
7275
codegenOptions: File,
7376
operationManifest: File?,
7477
outputDirectory: File,
75-
metadataOutput: File?
78+
metadataOutput: File?,
7679
) {
7780
val registry = apolloCompilerRegistry(
78-
arguments,
79-
logger,
80-
warnIfNotFound,
81+
arguments = arguments,
82+
logger = logger,
83+
plugins = plugins,
8184
)
8285
val codegenSchemaFile = codegenSchemas.map { it.file }.findCodegenSchemaFile()
8386
val codegenSchema = codegenSchemaFile.toCodegenSchema()
@@ -103,9 +106,9 @@ object EntryPoints {
103106
}
104107

105108
fun buildSources(
109+
plugins: List<ApolloCompilerPlugin>,
106110
arguments: Map<String, Any?>,
107111
logger: ApolloCompiler.Logger,
108-
warnIfNotFound: Boolean,
109112
schemas: List<InputFile>,
110113
executableDocuments: List<InputFile>,
111114
codegenSchemaOptions: File,
@@ -116,9 +119,9 @@ object EntryPoints {
116119
dataBuildersOutputDirectory: File,
117120
) {
118121
val registry = apolloCompilerRegistry(
119-
arguments,
120-
logger,
121-
warnIfNotFound,
122+
arguments = arguments,
123+
logger = logger,
124+
plugins = plugins,
122125
)
123126

124127
@Suppress("NAME_SHADOWING")
@@ -174,19 +177,19 @@ object EntryPoints {
174177
}
175178

176179
fun buildDataBuilders(
180+
plugins: List<ApolloCompilerPlugin>,
177181
arguments: Map<String, Any?>,
178182
logger: ApolloCompiler.Logger,
179-
warnIfNotFound: Boolean,
180183
codegenSchemas: List<InputFile>,
181184
upstreamMetadatas: List<InputFile>,
182185
downstreamUsedCoordinates: File,
183186
codegenOptions: File,
184-
outputDirectory: File
187+
outputDirectory: File,
185188
) {
186189
val registry = apolloCompilerRegistry(
187-
arguments,
188-
logger,
189-
warnIfNotFound,
190+
arguments = arguments,
191+
logger = logger,
192+
plugins = plugins,
190193
)
191194
val codegenSchemaFile = codegenSchemas.map { it.file }.findCodegenSchemaFile()
192195
val codegenSchema = codegenSchemaFile.toCodegenSchema()
@@ -212,42 +215,16 @@ fun Iterable<File>.findCodegenSchemaFile(): File {
212215
} ?: error("Cannot find CodegenSchema in $this")
213216
}
214217

215-
216-
217218
internal fun apolloCompilerRegistry(
219+
plugins: List<ApolloCompilerPlugin>,
218220
arguments: Map<String, Any?>,
219221
logger: ApolloCompiler.Logger,
220-
warnIfNotFound: Boolean = false,
221222
): DefaultApolloCompilerRegistry {
222223
val registry = DefaultApolloCompilerRegistry()
223-
val environment = ApolloCompilerPluginEnvironment(
224-
arguments,
225-
logger,
226-
)
227-
var hasPlugin = false
228-
val plugins = ServiceLoader.load(ApolloCompilerPlugin::class.java, ApolloCompilerPlugin::class.java.classLoader).toList()
224+
val environment = ApolloCompilerPluginEnvironment(arguments, logger)
229225
plugins.forEach {
230-
hasPlugin = true
231226
it.beforeCompilationStep(environment, registry)
232227
registry.registerPlugin(it)
233228
}
234-
235-
@Suppress("DEPRECATION")
236-
val pluginProviders = ServiceLoader.load(ApolloCompilerPluginProvider::class.java, ApolloCompilerPluginProvider::class.java.classLoader).toList()
237-
pluginProviders.forEach {
238-
// we make an exception for our own cache plugin because we want to display a nice error message to users before 4.3
239-
if (it.javaClass.name != "com.apollographql.cache.apollocompilerplugin.ApolloCacheCompilerPluginProvider") {
240-
println("Apollo: using ApolloCompilerPluginProvider is deprecated. You can use ApolloCompilerPlugin directly. See https://go.apollo.dev/ak-compiler-plugins for more details.")
241-
}
242-
hasPlugin = true
243-
val plugin = it.create(environment)
244-
plugin.beforeCompilationStep(environment, registry)
245-
registry.registerPlugin(plugin)
246-
}
247-
248-
if (!hasPlugin && warnIfNotFound) {
249-
println("Apollo: a compiler plugin was added with `Service.plugin()` but no plugin was loaded by the ServiceLoader. Check your META-INF/services/com.apollographql.apollo.compiler.ApolloCompilerPlugin file. See https://go.apollo.dev/ak-compiler-plugins for more details.")
250-
}
251-
252229
return registry
253230
}

‎libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo/compiler/model/CompilationUnitModel.kt‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package com.apollographql.apollo.compiler.model
2+
3+
import com.apollographql.apollo.annotations.ApolloInternal
4+
import kotlinx.serialization.Serializable
5+
import kotlinx.serialization.encodeToString
6+
import kotlinx.serialization.json.Json
7+
import kotlinx.serialization.json.JsonElement
8+
import java.io.File
9+
10+
@ApolloInternal
11+
@Serializable
12+
class CompilationUnitModel(
13+
/**
14+
* The Gradle project path of the service, e.g. ":feature:myFeature1"
15+
*/
16+
val gradleProjectPath: String,
17+
val serviceName: String,
18+
val schemaFiles: Set<String>,
19+
val graphqlSrcDirs: Set<String>,
20+
21+
/**
22+
* Upstream Gradle project paths e.g. [":graphqlShared"]
23+
*/
24+
val upstreamGradleProjectPaths: Set<String>,
25+
26+
/**
27+
* Downstream Gradle project paths e.g. [":feature:myFeature2"]
28+
*/
29+
val downstreamGradleProjectPaths: Set<String>,
30+
val endpointUrl: String?,
31+
val endpointHeaders: Map<String, String>?,
32+
33+
/**
34+
* Absolute paths to Apollo Compiler Plugin dependencies.
35+
*/
36+
val pluginDependencies: Set<String>,
37+
val pluginArguments: Map<String, JsonElement>,
38+
)
39+
40+
@ApolloInternal
41+
fun CompilationUnitModel.writeTo(file: File) {
42+
file.writeText(Json.encodeToString(this))
43+
}
44+
45+
@ApolloInternal
46+
fun File.toCompilationUnitModel(): CompilationUnitModel {
47+
@Suppress("JSON_FORMAT_REDUNDANT")
48+
return Json { ignoreUnknownKeys = true }.decodeFromString(readText())
49+
}

‎libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo/compiler/model/ProjectModel.kt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package com.apollographql.apollo.compiler.model
2+
3+
import com.apollographql.apollo.annotations.ApolloInternal
4+
import kotlinx.serialization.Serializable
5+
import kotlinx.serialization.encodeToString
6+
import kotlinx.serialization.json.Json
7+
import java.io.File
8+
9+
@ApolloInternal
10+
@Serializable
11+
class ProjectModel(
12+
val serviceNames: Set<String>,
13+
)
14+
15+
@ApolloInternal
16+
fun ProjectModel.writeTo(file: File) {
17+
file.writeText(Json.encodeToString(this))
18+
}
19+
20+
@ApolloInternal
21+
fun File.toProjectModel(): ProjectModel {
22+
@Suppress("JSON_FORMAT_REDUNDANT")
23+
return Json { ignoreUnknownKeys = true }.decodeFromString(readText())
24+
}

‎libraries/apollo-gradle-plugin-tasks/api/apollo-gradle-plugin-tasks.api‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@ public final class com/apollographql/apollo/gradle/task/ApolloGenerateCodegenSch
2828
public final fun run (Ljava/util/function/BiConsumer;Ljava/util/Map;ZLjava/util/List;Ljava/util/List;Ljava/util/List;Ljava/io/File;Ljava/io/File;)V
2929
}
3030

31+
public final class com/apollographql/apollo/gradle/task/ApolloGenerateCompilationUnitModelEntryPoint {
32+
public static final field Companion Lcom/apollographql/apollo/gradle/task/ApolloGenerateCompilationUnitModelEntryPoint$Companion;
33+
public fun <init> ()V
34+
public static final fun run (Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/lang/String;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/io/File;)V
35+
}
36+
37+
public final class com/apollographql/apollo/gradle/task/ApolloGenerateCompilationUnitModelEntryPoint$Companion {
38+
public final fun run (Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/lang/String;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/io/File;)V
39+
}
40+
3141
public final class com/apollographql/apollo/gradle/task/ApolloGenerateDataBuildersSourcesEntryPoint {
3242
public static final field Companion Lcom/apollographql/apollo/gradle/task/ApolloGenerateDataBuildersSourcesEntryPoint$Companion;
3343
public fun <init> ()V
@@ -62,6 +72,16 @@ public final class com/apollographql/apollo/gradle/task/ApolloGenerateOptionsKt
6272
public static final fun getKotlinTargetLanguage (Ljava/lang/String;Ljava/lang/String;)Lcom/apollographql/apollo/compiler/TargetLanguage;
6373
}
6474

75+
public final class com/apollographql/apollo/gradle/task/ApolloGenerateProjectModelEntryPoint {
76+
public static final field Companion Lcom/apollographql/apollo/gradle/task/ApolloGenerateProjectModelEntryPoint$Companion;
77+
public fun <init> ()V
78+
public static final fun run (Ljava/util/Set;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/util/Set;Ljava/io/File;Ljava/io/File;)V
79+
}
80+
81+
public final class com/apollographql/apollo/gradle/task/ApolloGenerateProjectModelEntryPoint$Companion {
82+
public final fun run (Ljava/util/Set;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/util/Set;Ljava/io/File;Ljava/io/File;)V
83+
}
84+
6585
public final class com/apollographql/apollo/gradle/task/ApolloGenerateSourcesEntryPoint {
6686
public static final field Companion Lcom/apollographql/apollo/gradle/task/ApolloGenerateSourcesEntryPoint$Companion;
6787
public fun <init> ()V

‎libraries/apollo-gradle-plugin-tasks/src/main/kotlin/com/apollographql/apollo/gradle/task/apolloGenerateCodegenSchema.kt‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.apollographql.apollo.gradle.task
22

3+
import com.apollographql.apollo.compiler.ApolloCompilerPlugin
34
import com.apollographql.apollo.compiler.EntryPoints
45
import gratatouille.tasks.GAny
56
import gratatouille.tasks.GInputFile
@@ -29,11 +30,17 @@ internal fun apolloGenerateCodegenSchema(
2930
}
3031
return
3132
}
32-
33-
EntryPoints.buildCodegenSchema(
34-
logger = logger.asLogger(),
33+
val logger = logger.asLogger()
34+
val plugins = loadCompilerPlugins(
3535
arguments = arguments,
36+
logger = logger,
37+
classLoader = ApolloCompilerPlugin::class.java.classLoader,
3638
warnIfNotFound = warnIfNotFound,
39+
)
40+
EntryPoints.buildCodegenSchema(
41+
plugins = plugins,
42+
arguments = arguments,
43+
logger = logger,
3744
normalizedSchemaFiles = (schemaFiles.takeIf { it.isNotEmpty() } ?: fallbackSchemaFiles).toInputFiles(),
3845
codegenSchemaOptionsFile = codegenSchemaOptionsFile,
3946
codegenSchemaFile = codegenSchemaFile,

0 commit comments

Comments
 (0)