Skip to content

Commit 20b6155

Browse files
authored
Add apolloTasksDependencies to ProjectModel (#6702)
1 parent 96c19dc commit 20b6155

File tree

5 files changed

+13
-3
lines changed

5 files changed

+13
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1987,7 +1987,8 @@ public final class com/apollographql/apollo/compiler/model/CompilationUnitModelK
19871987

19881988
public final class com/apollographql/apollo/compiler/model/ProjectModel {
19891989
public static final field Companion Lcom/apollographql/apollo/compiler/model/ProjectModel$Companion;
1990-
public fun <init> (Ljava/util/Set;)V
1990+
public fun <init> (Ljava/util/Set;Ljava/util/Set;)V
1991+
public final fun getApolloTasksDependencies ()Ljava/util/Set;
19911992
public final fun getServiceNames ()Ljava/util/Set;
19921993
}
19931994

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ import java.io.File
1010
@Serializable
1111
class ProjectModel(
1212
val serviceNames: Set<String>,
13+
/**
14+
* Absolute paths to the Apollo Gradle task dependencies.
15+
*/
16+
val apolloTasksDependencies: Set<String>,
1317
)
1418

1519
@ApolloInternal

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ public final class com/apollographql/apollo/gradle/task/ApolloGenerateOptionsKt
7575
public final class com/apollographql/apollo/gradle/task/ApolloGenerateProjectModelEntryPoint {
7676
public static final field Companion Lcom/apollographql/apollo/gradle/task/ApolloGenerateProjectModelEntryPoint$Companion;
7777
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
78+
public static final fun run (Ljava/util/Set;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
7979
}
8080

8181
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
82+
public final fun run (Ljava/util/Set;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
8383
}
8484

8585
public final class com/apollographql/apollo/gradle/task/ApolloGenerateSourcesEntryPoint {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import gratatouille.tasks.GTask
1111
internal fun apolloGenerateProjectModel(
1212
// Inputs
1313
serviceNames: Set<String>,
14+
apolloTasksDependencies: Set<String>,
1415

1516
// Telemetry data
1617
gradleVersion: String?,
@@ -28,6 +29,7 @@ internal fun apolloGenerateProjectModel(
2829
) {
2930
ProjectModel(
3031
serviceNames = serviceNames,
32+
apolloTasksDependencies = apolloTasksDependencies,
3133
)
3234
.writeTo(projectModel)
3335

libraries/apollo-gradle-plugin/src/main/kotlin/com/apollographql/apollo/gradle/internal/DefaultApolloExtension.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,9 @@ abstract class DefaultApolloExtension(
198198
taskDescription = "Generate Apollo project model",
199199

200200
serviceNames = project.provider { services.map { it.name }.toSet() },
201+
apolloTasksDependencies = project.provider {
202+
project.configurations.getByName("apolloTasks").files.map { it.absolutePath }.toSet()
203+
},
201204

202205
// Telemetry
203206
gradleVersion = project.provider { project.gradle.gradleVersion },

0 commit comments

Comments
 (0)