Skip to content

Commit f4c829b

Browse files
authored
Undeprecate schemaFile (#6055)
1 parent ada2a1f commit f4c829b

File tree

3 files changed

+1
-9
lines changed

3 files changed

+1
-9
lines changed

libraries/apollo-gradle-plugin-external/src/main/kotlin/com/apollographql/apollo/gradle/api/Service.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,8 @@ interface Service {
6767
fun srcDir(directory: Any)
6868

6969
/**
70-
* The location of the schema file.
71-
*
72-
* Because clients may extend the schema with client extensions in separate files, this is deprecated
73-
* in favor of [schemaFiles].
70+
* The location of the main schema file.
7471
*/
75-
@Deprecated("Replace with schemaFiles.from()")
76-
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_0_0)
7772
val schemaFile: RegularFileProperty
7873

7974
/**

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ abstract class DefaultApolloExtension(
104104
if (service.excludes.isPresent) add("excludes")
105105
@Suppress("DEPRECATION")
106106
if (service.sourceFolder.isPresent) add("excludes")
107-
@Suppress("DEPRECATION")
108107
if (service.schemaFile.isPresent) add("schemaFile")
109108
if (!service.schemaFiles.isEmpty) add("schemaFiles")
110109
if (service.scalarAdapterMapping.isNotEmpty()) {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,7 @@ internal fun DefaultService.fallbackFiles(project: Project, block: (Configurable
248248
internal fun DefaultService.schemaFiles(project: Project): FileCollection {
249249
val fileCollection = project.files()
250250

251-
@Suppress("DEPRECATION")
252251
if (schemaFile.isPresent) {
253-
project.logger.lifecycle("Apollo: using 'schemaFile.set()' is deprecated as additional schema files like 'extra.graphqls' might be required. Please use 'schemaFiles.from(fileTree(\"directory\").include(\"**/*.graphqls\"))' instead.")
254252
fileCollection.from(schemaFile)
255253
} else {
256254
fileCollection.from(schemaFiles)

0 commit comments

Comments
 (0)