Skip to content

Commit 101e9a7

Browse files
authored
fix a lint warning (#6706)
1 parent 4ea3db4 commit 101e9a7

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

gradle/libraries.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ compat-patrouille = "0.0.2"
2222
compose = "1.9.1"
2323
guava = "33.5.0-jre"
2424
# This is used at build time only, and it's ok to resolve SNAPSHOTS
25-
gratatouille = "0.1.3-SNAPSHOT-5760abde21dbc0bea26bb4a401ca5fc69067fa80"
25+
gratatouille = "0.1.3-SNAPSHOT-8fc7c233e6942228b019ddc698c61353e1a353c7"
2626
# This is a transitive dependency of apollo-gradle-plugin and therefore cannot use SNAPSHOTs
2727
gratatouille-runtime = "0.1.2"
2828
javaPoet = "1.13.0"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.apollographql.apollo.gradle.task
22

33
import com.apollographql.apollo.compiler.APOLLO_VERSION
44
import com.apollographql.apollo.tooling.SchemaDownloader
5+
import gratatouille.tasks.GInputFile
56
import gratatouille.tasks.GInternal
67
import gratatouille.tasks.GLogger
78
import gratatouille.tasks.GTask
@@ -17,7 +18,7 @@ internal fun apolloDownloadSchema(
1718
key: String?,
1819
graphVariant: String?,
1920
registryUrl: String?,
20-
@GInternal schema: File,
21+
@GInternal schema: GInputFile,
2122
insecure: Boolean?,
2223
headers: Map<String, String>,
2324
logger: GLogger,

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import org.gradle.api.component.SoftwareComponent
4545
import org.gradle.api.component.SoftwareComponentFactory
4646
import org.gradle.api.file.DirectoryProperty
4747
import org.gradle.api.file.RegularFile
48+
import org.gradle.api.file.RegularFileProperty
4849
import org.gradle.api.file.SourceDirectorySet
4950
import org.gradle.api.provider.Property
5051
import org.gradle.api.provider.Provider
@@ -848,6 +849,10 @@ abstract class DefaultApolloExtension(
848849
}
849850
}
850851

852+
private fun Project.regularFileProperty(provider : () -> File): RegularFileProperty {
853+
return objects.fileProperty().fileProvider(project.provider(provider))
854+
}
855+
851856
private fun registerDownloadSchemaTasks(service: DefaultService) {
852857
val introspection = service.introspection
853858
var taskProvider: TaskProvider<ApolloDownloadSchemaTask>? = null
@@ -857,7 +862,7 @@ abstract class DefaultApolloExtension(
857862
taskProvider = project.registerApolloDownloadSchemaTask(
858863
taskName = ModelNames.downloadApolloSchemaIntrospection(service),
859864
taskGroup = TASK_GROUP,
860-
schema = project.provider { service.guessSchemaFile(project, introspection.schemaFile) },
865+
schema = project.regularFileProperty { service.guessSchemaFile(project, introspection.schemaFile) },
861866
endpoint = introspection.endpointUrl,
862867
headers = introspection.headers,
863868
graph = project.provider { null },
@@ -873,7 +878,7 @@ abstract class DefaultApolloExtension(
873878
taskProvider = project.registerApolloDownloadSchemaTask(
874879
taskName = ModelNames.downloadApolloSchemaRegistry(service),
875880
taskGroup = TASK_GROUP,
876-
schema = project.provider { service.guessSchemaFile(project, registry.schemaFile) },
881+
schema = project.regularFileProperty { service.guessSchemaFile(project, registry.schemaFile) },
877882
endpoint = project.provider { null },
878883
headers = project.objects.mapProperty(String::class.java, String::class.java),
879884
graph = registry.graph,
@@ -889,9 +894,7 @@ abstract class DefaultApolloExtension(
889894
connection.execute(
890895
SchemaConnection(
891896
taskProvider,
892-
taskProvider.flatMap { downloadSchemaTask ->
893-
project.layout.file(downloadSchemaTask.schema)
894-
}
897+
taskProvider.flatMap { it.schema }
895898
)
896899
)
897900
}

0 commit comments

Comments
 (0)