diff --git a/libraries/apollo-compiler/api/apollo-compiler.api b/libraries/apollo-compiler/api/apollo-compiler.api index c3d2be12af2..41ce0a77370 100644 --- a/libraries/apollo-compiler/api/apollo-compiler.api +++ b/libraries/apollo-compiler/api/apollo-compiler.api @@ -1987,7 +1987,8 @@ public final class com/apollographql/apollo/compiler/model/CompilationUnitModelK public final class com/apollographql/apollo/compiler/model/ProjectModel { public static final field Companion Lcom/apollographql/apollo/compiler/model/ProjectModel$Companion; - public fun (Ljava/util/Set;)V + public fun (Ljava/util/Set;Ljava/util/Set;)V + public final fun getApolloTasksDependencies ()Ljava/util/Set; public final fun getServiceNames ()Ljava/util/Set; } diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo/compiler/model/ProjectModel.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo/compiler/model/ProjectModel.kt index 0f3973464db..26373ddb2af 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo/compiler/model/ProjectModel.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo/compiler/model/ProjectModel.kt @@ -10,6 +10,10 @@ import java.io.File @Serializable class ProjectModel( val serviceNames: Set, + /** + * Absolute paths to the Apollo Gradle task dependencies. + */ + val apolloTasksDependencies: Set, ) @ApolloInternal diff --git a/libraries/apollo-gradle-plugin-tasks/api/apollo-gradle-plugin-tasks.api b/libraries/apollo-gradle-plugin-tasks/api/apollo-gradle-plugin-tasks.api index 40331747172..f4b471c98d4 100644 --- a/libraries/apollo-gradle-plugin-tasks/api/apollo-gradle-plugin-tasks.api +++ b/libraries/apollo-gradle-plugin-tasks/api/apollo-gradle-plugin-tasks.api @@ -75,11 +75,11 @@ public final class com/apollographql/apollo/gradle/task/ApolloGenerateOptionsKt public final class com/apollographql/apollo/gradle/task/ApolloGenerateProjectModelEntryPoint { public static final field Companion Lcom/apollographql/apollo/gradle/task/ApolloGenerateProjectModelEntryPoint$Companion; public fun ()V - 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 + 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 } public final class com/apollographql/apollo/gradle/task/ApolloGenerateProjectModelEntryPoint$Companion { - 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 + 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 } public final class com/apollographql/apollo/gradle/task/ApolloGenerateSourcesEntryPoint { diff --git a/libraries/apollo-gradle-plugin-tasks/src/main/kotlin/com/apollographql/apollo/gradle/task/apolloGenerateProjectModel.kt b/libraries/apollo-gradle-plugin-tasks/src/main/kotlin/com/apollographql/apollo/gradle/task/apolloGenerateProjectModel.kt index c63a8c769fc..b376fe641f3 100644 --- a/libraries/apollo-gradle-plugin-tasks/src/main/kotlin/com/apollographql/apollo/gradle/task/apolloGenerateProjectModel.kt +++ b/libraries/apollo-gradle-plugin-tasks/src/main/kotlin/com/apollographql/apollo/gradle/task/apolloGenerateProjectModel.kt @@ -11,6 +11,7 @@ import gratatouille.tasks.GTask internal fun apolloGenerateProjectModel( // Inputs serviceNames: Set, + apolloTasksDependencies: Set, // Telemetry data gradleVersion: String?, @@ -28,6 +29,7 @@ internal fun apolloGenerateProjectModel( ) { ProjectModel( serviceNames = serviceNames, + apolloTasksDependencies = apolloTasksDependencies, ) .writeTo(projectModel) diff --git a/libraries/apollo-gradle-plugin/src/main/kotlin/com/apollographql/apollo/gradle/internal/DefaultApolloExtension.kt b/libraries/apollo-gradle-plugin/src/main/kotlin/com/apollographql/apollo/gradle/internal/DefaultApolloExtension.kt index ef14354878d..48b807ba217 100644 --- a/libraries/apollo-gradle-plugin/src/main/kotlin/com/apollographql/apollo/gradle/internal/DefaultApolloExtension.kt +++ b/libraries/apollo-gradle-plugin/src/main/kotlin/com/apollographql/apollo/gradle/internal/DefaultApolloExtension.kt @@ -198,6 +198,9 @@ abstract class DefaultApolloExtension( taskDescription = "Generate Apollo project model", serviceNames = project.provider { services.map { it.name }.toSet() }, + apolloTasksDependencies = project.provider { + project.configurations.getByName("apolloTasks").files.map { it.absolutePath }.toSet() + }, // Telemetry gradleVersion = project.provider { project.gradle.gradleVersion },