From 44d5673d325e959f3df486c80b54b287e2d88b34 Mon Sep 17 00:00:00 2001 From: Martin Bonnin Date: Mon, 12 Dec 2022 12:16:13 +0100 Subject: [PATCH] use service {} in all messages/docs --- design-docs/Scalar adapter configuration.md | 29 ++++--- docs/source/advanced/java.mdx | 4 +- docs/source/advanced/multi-modules.mdx | 10 +++ docs/source/advanced/operation-variables.mdx | 6 +- docs/source/advanced/persisted-queries.mdx | 38 +++++---- docs/source/advanced/plugin-configuration.mdx | 14 +++- .../advanced/response-based-codegen.mdx | 2 + docs/source/advanced/source-sets.mdx | 12 ++- docs/source/advanced/upload.mdx | 4 +- docs/source/caching/store.mdx | 4 +- docs/source/essentials/custom-scalars.mdx | 16 ++-- docs/source/index.md | 4 +- docs/source/migration/1.3.mdx | 32 +++++--- docs/source/testing/data-builders.mdx | 8 +- docs/source/testing/test-builders.mdx | 8 +- docs/source/tutorial/01-configure-project.mdx | 2 + .../apollo3/gradle/api/Service.kt | 40 +++++---- .../gradle/internal/DefaultApolloExtension.kt | 2 +- .../gradle/internal/KotlinPluginFacade.kt | 2 +- .../gradle/test/AndroidProjectTests.kt | 8 +- .../apollo3/gradle/test/DeprecationTests.kt | 20 ++--- .../apollo3/gradle/test/KotlinDSLTests.kt | 12 --- .../gradle/test/KotlinJVMProjectTests.kt | 4 +- .../gradle/test/LanguageVersionTests.kt | 8 +- .../apollo3/gradle/test/LazyTests.kt | 16 ++-- .../apollo3/gradle/test/MultiServicesTests.kt | 4 +- .../gradle/test/OperationIdGeneratorTests.kt | 6 +- .../apollo3/gradle/test/ServiceTests.kt | 82 ++++++++++++------- .../apollo3/gradle/test/UpToDateTests.kt | 15 ++-- .../apollo3/gradle/util/TestUtils.kt | 4 +- .../android-java/build.gradle.kts | 4 +- .../testProjects/buildCache/build.gradle.kts | 4 +- .../configuration-cache/leaf/build.gradle.kts | 4 +- .../configuration-cache/root/build.gradle.kts | 10 ++- .../defaultVersion/build.gradle.kts | 4 +- .../deprecationWarnings/build.gradle.kts | 4 +- .../executable-schema-file/build.gradle.kts | 4 +- .../testProjects/java-only/build.gradle.kts | 8 +- .../build.gradle.kts | 4 +- .../mismatchedVersions/build.gradle.kts | 4 +- .../leaf/build.gradle.kts | 6 +- .../root/build.gradle.kts | 8 +- .../leaf/build.gradle.kts | 4 +- .../root/build.gradle.kts | 10 ++- .../leaf/build.gradle.kts | 4 +- .../node1/build.gradle.kts | 6 +- .../node2/build.gradle.kts | 6 +- .../root/build.gradle.kts | 8 +- .../node1/impl/build.gradle.kts | 4 +- .../node2/impl/build.gradle.kts | 4 +- .../root/build.gradle.kts | 10 ++- .../leaf/build.gradle.kts | 4 +- .../node/build.gradle.kts | 6 +- .../root/build.gradle.kts | 8 +- .../multi-modules/leaf/build.gradle.kts | 4 +- .../multi-modules/root/build.gradle.kts | 8 +- .../multiplatform/build.gradle.kts | 4 +- .../operationIds/build.gradle.kts | 20 +++-- .../register-operations/build.gradle.kts | 12 +-- .../testSourceSet/build.gradle.kts | 8 +- 60 files changed, 382 insertions(+), 228 deletions(-) diff --git a/design-docs/Scalar adapter configuration.md b/design-docs/Scalar adapter configuration.md index 4daa9afee08..6d16772b09a 100644 --- a/design-docs/Scalar adapter configuration.md +++ b/design-docs/Scalar adapter configuration.md @@ -83,12 +83,14 @@ requests (in the `executionContext`), and then to the adapters in `HttpNetworkTr Plugin configuration: ```kotlin -apollo { - mapScalar("MyDate", "com.example.MyDate", "com.example.MyDateAdapter()") +apollo { + service("service") { + mapScalar("MyDate", "com.example.MyDate", "com.example.MyDateAdapter()") - mapScalar("ID", "kotlin.Long", "com.apollographql.apollo3.api.LongAdapter") - - mapScalar("MyLong", "kotlin.Long") + mapScalar("ID", "kotlin.Long", "com.apollographql.apollo3.api.LongAdapter") + + mapScalar("MyLong", "kotlin.Long") + } } ``` @@ -117,16 +119,19 @@ Let's also have convenience shortcuts for the types for which we have built-in a ```kotlin apollo { - // equivalent to mapScalar("ID", "kotlin.Long", "com.apollographql.apollo3.api.LongAdapter") - mapScalarToKotlinLong("ID") + service("service") { + // equivalent to mapScalar("ID", "kotlin.Long", "com.apollographql.apollo3.api.LongAdapter") + mapScalarToKotlinLong("ID") - // equivalent to mapScalar("ID", "java.lang.Long", "com.apollographql.apollo3.api.LongAdapter") - mapScalarToJavaLong("ID") + // equivalent to mapScalar("ID", "java.lang.Long", "com.apollographql.apollo3.api.LongAdapter") + mapScalarToJavaLong("ID") - // equivalent to mapScalar("Json", "kotlin.Any", "com.apollographql.apollo3.api.AnyAdapter") - mapScalarToKotlinAny("Json") + // equivalent to mapScalar("Json", "kotlin.Any", "com.apollographql.apollo3.api.AnyAdapter") + mapScalarToKotlinAny("Json") - // etc. + // etc. + } +} ``` With this, it is no longer necessary (but still possible) to register the adapters at runtime with `addCustomScalarAdapter`. diff --git a/docs/source/advanced/java.mdx b/docs/source/advanced/java.mdx index 2c57f481824..ebd34978d07 100644 --- a/docs/source/advanced/java.mdx +++ b/docs/source/advanced/java.mdx @@ -10,7 +10,9 @@ Apollo Kotlin generates Kotlin code by default, but you can configure it to use ```kotlin title="build.gradle[.kts]" apollo { - generateKotlinModels.set(false) + service("service") { + generateKotlinModels.set(false) + } } ``` diff --git a/docs/source/advanced/multi-modules.mdx b/docs/source/advanced/multi-modules.mdx index 5d9bed97549..e1accea1c45 100644 --- a/docs/source/advanced/multi-modules.mdx +++ b/docs/source/advanced/multi-modules.mdx @@ -16,7 +16,9 @@ Configure your schema module to generate Apollo metadata: ```kotlin // schema/build.gradle.kts apollo { + service("service") { generateApolloMetadata.set(true) + } } ``` @@ -58,14 +60,18 @@ dependencies { apolloMetadata(project(":schema")) } apollo { + service("service") { generateApolloMetadata.set(true) + } } // schema/build.gradle.kts // This module is the schema module // Place the schema in this module apollo { + service("service") { generateApolloMetadata.set(true) + } } ``` @@ -119,20 +125,24 @@ If that happens, you will need to resolve the type clash manually by forcing gen ```kotlin // shared/build.gradle.kts apollo { + service("service") { // For an example if ReviewInput clashes alwaysGenerateTypesMatching.set(listOf("ReviewInput")) // You can also pass Regex patterns alwaysGenerateTypesMatching.set(listOf(".*Input")) + } } ``` ```groovy // shared/build.gradle apollo { + service("service") { // For an example if ReviewInput clashes alwaysGenerateTypesMatching.set(["ReviewInput"]) // You can also pass Regex patterns alwaysGenerateTypesMatching.set([".*Input"]) + } } ``` diff --git a/docs/source/advanced/operation-variables.mdx b/docs/source/advanced/operation-variables.mdx index 06a9c1821e8..0a839a6db0e 100644 --- a/docs/source/advanced/operation-variables.mdx +++ b/docs/source/advanced/operation-variables.mdx @@ -42,8 +42,10 @@ To disable optional variables globally, update your Gradle config like so: ```kotlin apollo { - // ... - generateOptionalOperationVariables.set(false) + service("service") { + // ... + generateOptionalOperationVariables.set(false) + } } ``` diff --git a/docs/source/advanced/persisted-queries.mdx b/docs/source/advanced/persisted-queries.mdx index 74c996cbc1c..c7217ed2b97 100644 --- a/docs/source/advanced/persisted-queries.mdx +++ b/docs/source/advanced/persisted-queries.mdx @@ -42,9 +42,11 @@ apolloClient.query(myQuery).enableAutoPersistedQueries(false).toFlow() If your backend uses custom persisted queries, Apollo Kotlin can generate an OperationOutput json from your .graphql queries. They will match what the client is sending exactly so you can persist them on your server. -``` +```kotlin apollo { - generateOperationOutput.set(true) + service("service") { + generateOperationOutput.set(true) + } } ``` @@ -58,13 +60,15 @@ Example Md5 hash generator: ```kotlin apollo { - operationIdGenerator.set(object: com.apollographql.apollo3.compiler.OperationIdGenerator { - override val version = "my-md5-version1" + service("service") { + operationIdGenerator.set(object : com.apollographql.apollo3.compiler.OperationIdGenerator { + override val version = "my-md5-version1" - override fun apply(operationDocument: String, operationName: String): String { - return operationDocument.md5() - } + override fun apply(operationDocument: String, operationName: String): String { + return operationDocument.md5() + } }) + } } ``` @@ -72,16 +76,18 @@ apollo { import com.apollographql.apollo3.compiler.OperationIdGenerator apollo { - operationIdGenerator = new OperationIdGenerator() { - String apply(String operationDocument, String operationName) { - return operationDocument.md5() + service("service") { + operationIdGenerator = new OperationIdGenerator() { + String apply(String operationDocument, String operationName) { + return operationDocument.md5() + } + + /** + * Use this version override to indicate an update to the implementation. + * This forces gradle to recompile models. + */ + String version = "my-md5-v1" } - - /** - * Use this version override to indicate an update to the implementation. - * This forces gradle to recompile models. - */ - String version = "my-md5-v1" } } ``` diff --git a/docs/source/advanced/plugin-configuration.mdx b/docs/source/advanced/plugin-configuration.mdx index 39d2dd8a7b0..5c8d7ce3c3a 100644 --- a/docs/source/advanced/plugin-configuration.mdx +++ b/docs/source/advanced/plugin-configuration.mdx @@ -29,7 +29,9 @@ Specify the location of your schema file using the `schemaFile` property: ```kotlin apollo { - schemaFile.set(file("shared/graphql/schema.graphqls")) + service("service") { + schemaFile.set(file("shared/graphql/schema.graphqls")) + } } ``` @@ -43,7 +45,9 @@ If you expand your schema in a separate file, you can instruct Apollo Kotlin to ```kotlin apollo { - schemaFiles.set(setOf(file("shared/graphql/schema.graphqls"), file("shared/graphql/extra.graphqls"))) + service("service") { + schemaFiles.set(setOf(file("shared/graphql/schema.graphqls"), file("shared/graphql/extra.graphqls"))) + } } ``` @@ -62,8 +66,10 @@ JVM project: ```kotlin apollo { - outputDirConnection { - connectToKotlinSourceSet("test") + service("service") { + outputDirConnection { + connectToKotlinSourceSet("test") + } } } ``` diff --git a/docs/source/advanced/response-based-codegen.mdx b/docs/source/advanced/response-based-codegen.mdx index 2bdce6d45a5..9619217f201 100644 --- a/docs/source/advanced/response-based-codegen.mdx +++ b/docs/source/advanced/response-based-codegen.mdx @@ -18,8 +18,10 @@ To use a particular codegen, configure `codegenModels` in your Gradle scripts: ```kotlin title="build.gradle.kts" apollo { + service("service") { // ... codegenModels.set("responseBased") + } } ``` diff --git a/docs/source/advanced/source-sets.mdx b/docs/source/advanced/source-sets.mdx index 646fb169434..5c2ad1c23d1 100644 --- a/docs/source/advanced/source-sets.mdx +++ b/docs/source/advanced/source-sets.mdx @@ -10,8 +10,10 @@ For an example, you can add them to the "test" source set: ```kotlin apollo { - outputDirConnection { - connectToKotlinSourceSet("test") + service("service") { + outputDirConnection { + connectToKotlinSourceSet("test") + } } } ``` @@ -20,8 +22,10 @@ On Android, because the generated files are added to the `main` source set, they ```kotlin apollo { - outputDirConnection { - connectToAndroidSourceSet("demoDebug") + service("service") { + outputDirConnection { + connectToAndroidSourceSet("demoDebug") + } } } ``` diff --git a/docs/source/advanced/upload.mdx b/docs/source/advanced/upload.mdx index 42d93b94c8f..8e6e8a6e962 100644 --- a/docs/source/advanced/upload.mdx +++ b/docs/source/advanced/upload.mdx @@ -8,7 +8,9 @@ First, add the following custom scalar mapping to the Apollo Gradle plugin confi ```kotlin title="build.gradle[.kts]" apollo { - mapScalarToUpload("Upload") + service("service") { + mapScalarToUpload("Upload") + } } ``` diff --git a/docs/source/caching/store.mdx b/docs/source/caching/store.mdx index bc6b4532d6d..d7def8a0541 100644 --- a/docs/source/caching/store.mdx +++ b/docs/source/caching/store.mdx @@ -81,7 +81,9 @@ Apollo Kotlin makes an exception to that rule and allows to read/write individua ```kotlin apollo { - generateFragmentImplementations.set(true) + service("service") { + generateFragmentImplementations.set(true) + } } ``` diff --git a/docs/source/essentials/custom-scalars.mdx b/docs/source/essentials/custom-scalars.mdx index 1848fc2fb61..1a73db75045 100644 --- a/docs/source/essentials/custom-scalars.mdx +++ b/docs/source/essentials/custom-scalars.mdx @@ -10,10 +10,12 @@ To interact with custom scalars in your Apollo Kotlin app, you need to define a ```kotlin title="build.gradle[.kts]" apollo { - mapScalar("GeoPoint", "com.example.GeoPoint") + service("service") { + mapScalar("GeoPoint", "com.example.GeoPoint") - // Shortcuts exist for standard types - equivalent to mapScalar("Long", "kotlin.Long") - mapScalarToKotlinLong("Long") + // Shortcuts exist for standard types - equivalent to mapScalar("Long", "kotlin.Long") + mapScalarToKotlinLong("Long") + } } ``` @@ -89,7 +91,9 @@ A third argument can be passed to `mapScalar` to specify the adapter to use: ```kotlin title="build.gradle[.kts]" apollo { - mapScalar("GeoPoint", "com.example.GeoPoint", "com.example.Adapters.geoPointAdapter") + service("service") { + mapScalar("GeoPoint", "com.example.GeoPoint", "com.example.Adapters.geoPointAdapter") + } } ``` @@ -148,6 +152,8 @@ dependencies { } apollo { - mapScalar("Date", "java.util.Date", "com.apollographql.apollo3.adapter.DateAdapter") + service("service") { + mapScalar("Date", "java.util.Date", "com.apollographql.apollo3.adapter.DateAdapter") + } } ``` diff --git a/docs/source/index.md b/docs/source/index.md index efac41e1e50..b773de3ab63 100644 --- a/docs/source/index.md +++ b/docs/source/index.md @@ -84,7 +84,9 @@ Set the package name to use for the generated models: ```kotlin apollo { - packageName.set("com.example") + service("service") { + packageName.set("com.example") + } } ``` diff --git a/docs/source/migration/1.3.mdx b/docs/source/migration/1.3.mdx index 19bbfc87410..e770adfa435 100644 --- a/docs/source/migration/1.3.mdx +++ b/docs/source/migration/1.3.mdx @@ -78,7 +78,9 @@ sourceSets { // With: // highlight-start apollo { - srcDir("/path/to/your/graphql/queries/dir") + service("service") { + srcDir("/path/to/your/graphql/queries/dir") + } } // highlight-end ``` @@ -86,18 +88,22 @@ apollo { ```groovy title="build.gradle" // Replace apollo { - sourceSet { - schemaFilePath = "/path/to/your/schema.json" - exclude = "**/*.gql" + service("service") { + sourceSet { + schemaFilePath = "/path/to/your/schema.json" + exclude = "**/*.gql" + } + outputPackageName = "com.example" } - outputPackageName = "com.example" } // With: apollo { - schemaFile.set(file("/path/to/your/schema.json")) - graphqlSourceDirectorySet.exclude("**/*.gql") - packageName.set("com.example") + service("service") { + schemaFile.set(file("/path/to/your/schema.json")) + graphqlSourceDirectorySet.exclude("**/*.gql") + packageName.set("com.example") + } } ``` @@ -111,11 +117,13 @@ you to use the [Property.set](https://docs.gradle.org/current/javadoc/org/gradle ```kotlin title="build.gradle" apollo { - // Replace: - setGenerateKotlinModels(true) + service("service") { + // Replace: + setGenerateKotlinModels(true) - // With: - generateKotlinModels.set(true) // highlight-line + // With: + generateKotlinModels.set(true) // highlight-line + } } ``` diff --git a/docs/source/testing/data-builders.mdx b/docs/source/testing/data-builders.mdx index a5a9cbc4541..5c7011dd7cf 100644 --- a/docs/source/testing/data-builders.mdx +++ b/docs/source/testing/data-builders.mdx @@ -14,10 +14,12 @@ To enable data, set the `generateDataBuilders` option to `true`: ```kotlin title="build.gradle[.kts]" apollo { - // ... + service("service") { + // ... - // Enable data builder generation - generateDataBuilders.set(true) + // Enable data builder generation + generateDataBuilders.set(true) + } } ``` diff --git a/docs/source/testing/test-builders.mdx b/docs/source/testing/test-builders.mdx index d5312f67c40..157925f48dc 100644 --- a/docs/source/testing/test-builders.mdx +++ b/docs/source/testing/test-builders.mdx @@ -12,10 +12,12 @@ Test builders are _not_ enabled by default, because they aren't useful for every ```kotlin title="build.gradle[.kts]" apollo { - // ... + service("service") { + // ... - // Enable test builder generation - generateTestBuilders.set(true) + // Enable test builder generation + generateTestBuilders.set(true) + } } ``` diff --git a/docs/source/tutorial/01-configure-project.mdx b/docs/source/tutorial/01-configure-project.mdx index d176112371d..6bf5655caa7 100644 --- a/docs/source/tutorial/01-configure-project.mdx +++ b/docs/source/tutorial/01-configure-project.mdx @@ -58,7 +58,9 @@ Configure the Apollo plugin to specify the package in which the Kotlin files wil ```kotlin title="app/build.gradle.kts" apollo { + service("service") { packageName.set("com.example.rocketreserver") + } } ``` diff --git a/libraries/apollo-gradle-plugin-external/src/main/kotlin/com/apollographql/apollo3/gradle/api/Service.kt b/libraries/apollo-gradle-plugin-external/src/main/kotlin/com/apollographql/apollo3/gradle/api/Service.kt index b9238515093..19a412d4ce1 100644 --- a/libraries/apollo-gradle-plugin-external/src/main/kotlin/com/apollographql/apollo3/gradle/api/Service.kt +++ b/libraries/apollo-gradle-plugin-external/src/main/kotlin/com/apollographql/apollo3/gradle/api/Service.kt @@ -227,16 +227,18 @@ interface Service { * import com.apollographql.apollo3.compiler.OperationIdGenerator * * apollo { - * operationIdGenerator = new OperationIdGenerator() { - * String apply(String operationDocument, String operationFilepath) { - * return operationDocument.md5() + * service("service") { + * operationIdGenerator = new OperationIdGenerator() { + * String apply(String operationDocument, String operationFilepath) { + * return operationDocument.md5() + * } + * + * /** + * * Use this version override to indicate an update to the implementation. + * * This invalidates the current cache. + * */ + * String version = "v1" * } - * - * /** - * * Use this version override to indicate an update to the implementation. - * * This invalidates the current cache. - * */ - * String version = "v1" * } * } * ``` @@ -255,16 +257,18 @@ interface Service { * import com.apollographql.apollo3.compiler.OperationIdGenerator * * apollo { - * operationOutputGenerator = new OperationIdGenerator() { - * String apply(List TargetLanguage.KOTLIN_1_4 "1.5" -> TargetLanguage.KOTLIN_1_5 diff --git a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/AndroidProjectTests.kt b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/AndroidProjectTests.kt index cad9d34449d..83f130e02d5 100644 --- a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/AndroidProjectTests.kt +++ b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/AndroidProjectTests.kt @@ -17,7 +17,9 @@ class AndroidProjectTests { fun `android library compiles`() { withProject(apolloConfiguration = """ apollo { - packageNamesFromFilePaths() + service("service") { + packageNamesFromFilePaths() + } } """.trimIndent(), usesKotlinDsl = false, @@ -38,7 +40,9 @@ class AndroidProjectTests { fun `android application compiles and produces an apk`() { withProject(apolloConfiguration = """ apollo { - packageNamesFromFilePaths() + service("service") { + packageNamesFromFilePaths() + } } """.trimIndent(), usesKotlinDsl = false, diff --git a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/DeprecationTests.kt b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/DeprecationTests.kt index dc40318553f..193087f515e 100644 --- a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/DeprecationTests.kt +++ b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/DeprecationTests.kt @@ -1,6 +1,7 @@ package com.apollographql.apollo3.gradle.test import com.apollographql.apollo3.gradle.util.TestUtils +import com.apollographql.apollo3.gradle.util.replaceInText import com.google.common.truth.Truth import org.gradle.testkit.runner.TaskOutcome import org.gradle.testkit.runner.UnexpectedBuildFailure @@ -22,11 +23,11 @@ class DeprecationTests { @Test fun `deprecation warnings can be silenced`() { TestUtils.withTestProject("deprecationWarnings") { dir -> - File(dir, "build.gradle.kts").appendText(""" - apollo { - warnOnDeprecatedUsages.set(false) - } - """.trimIndent()) + File(dir, "build.gradle.kts").replaceInText("packageName.set(\"com.example\")", """ + packageName.set("com.example") + warnOnDeprecatedUsages.set(false) + """.trimIndent()) + val result = TestUtils.executeTask("generateServiceApolloSources", dir) Assert.assertEquals(TaskOutcome.SUCCESS, result.task(":generateServiceApolloSources")!!.outcome) Truth.assertThat(result.output).doesNotContain("Apollo: Use of deprecated field") @@ -36,11 +37,10 @@ class DeprecationTests { @Test fun `failOnWarnings works as expected`() { TestUtils.withTestProject("deprecationWarnings") { dir -> - File(dir, "build.gradle.kts").appendText(""" - apollo { - failOnWarnings.set(true) - } - """.trimIndent()) + File(dir, "build.gradle.kts").replaceInText("packageName.set(\"com.example\")", """ + packageName.set("com.example") + failOnWarnings.set(true) + """.trimIndent()) try { TestUtils.executeTask("generateServiceApolloSources", dir) Assert.fail("generateServiceApolloSources was expected to fail") diff --git a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/KotlinDSLTests.kt b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/KotlinDSLTests.kt index c1293de08bb..cefd1ba4424 100644 --- a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/KotlinDSLTests.kt +++ b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/KotlinDSLTests.kt @@ -10,18 +10,6 @@ import org.junit.Assert.assertEquals import org.junit.Test class KotlinDSLTests { - @Test - fun `generated accessors work as expected`() { - val apolloConfiguration = """ - apollo { - } - """.trimIndent() - - TestUtils.withGeneratedAccessorsProject(apolloConfiguration) {dir -> - TestUtils.executeGradle(dir) - } - } - @Test fun `generated accessors do not expose DefaultApolloExtension`() { val apolloConfiguration = """ diff --git a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/KotlinJVMProjectTests.kt b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/KotlinJVMProjectTests.kt index 8d8ad924a18..9e50d38f6f4 100644 --- a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/KotlinJVMProjectTests.kt +++ b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/KotlinJVMProjectTests.kt @@ -26,7 +26,9 @@ class KotlinJVMProjectTests { fun `non-android-kotlin builds a jar`() { val apolloConfiguration = """ apollo { - packageNamesFromFilePaths() + service("service") { + packageNamesFromFilePaths() + } } """.trimIndent() TestUtils.withProject(usesKotlinDsl = false, diff --git a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/LanguageVersionTests.kt b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/LanguageVersionTests.kt index a8200183e1c..45ed0805e46 100644 --- a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/LanguageVersionTests.kt +++ b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/LanguageVersionTests.kt @@ -71,9 +71,11 @@ class LanguageVersionTests { val apolloConfiguration = """ apollo { - packageNamesFromFilePaths() - codegenModels.set(com.apollographql.apollo3.compiler.MODELS_RESPONSE_BASED) - languageVersion.set("$apolloLanguageVersion") + service("service") { + packageNamesFromFilePaths() + codegenModels.set(com.apollographql.apollo3.compiler.MODELS_RESPONSE_BASED) + languageVersion.set("$apolloLanguageVersion") + } } """.trimIndent() return kotlinConfiguration + "\n" + apolloConfiguration diff --git a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/LazyTests.kt b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/LazyTests.kt index 9369856e2b5..797f60833c5 100644 --- a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/LazyTests.kt +++ b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/LazyTests.kt @@ -12,10 +12,12 @@ class LazyTests { val apolloConfiguration = """ apollo { - packageNamesFromFilePaths() - useSemanticNaming.set(project.provider { - throw IllegalArgumentException("this should not be called during configuration") - }) + service("service") { + packageNamesFromFilePaths() + useSemanticNaming.set(project.provider { + throw IllegalArgumentException("this should not be called during configuration") + }) + } } """.trimIndent() TestUtils.withProject( @@ -45,8 +47,10 @@ val installTask = tasks.register("installTask", InstallGraphQLFilesTask::class.j outputDir.set(project.file("build/toto")) } apollo { - packageNamesFromFilePaths() - srcDir(installTask.flatMap { it.outputDir }) + service("service") { + packageNamesFromFilePaths() + srcDir(installTask.flatMap { it.outputDir }) + } } """.trimIndent() diff --git a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/MultiServicesTests.kt b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/MultiServicesTests.kt index 3af6106205f..c1347c1d396 100644 --- a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/MultiServicesTests.kt +++ b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/MultiServicesTests.kt @@ -35,7 +35,9 @@ class MultiServicesTests { fun `multiple schema files in different folders throw an error`() { val apolloConfiguration = """ apollo { - packageNamesFromFilePaths() + service("service") { + packageNamesFromFilePaths() + } } """.trimIndent() withMultipleServicesProject(apolloConfiguration) { dir -> diff --git a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/OperationIdGeneratorTests.kt b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/OperationIdGeneratorTests.kt index 789a2d0e9b2..5ec8669b605 100644 --- a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/OperationIdGeneratorTests.kt +++ b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/OperationIdGeneratorTests.kt @@ -22,8 +22,10 @@ class OperationIdGeneratorTests { } apollo { - operationIdGenerator = new MyIdGenerator() - packageNamesFromFilePaths() + service("service") { + operationIdGenerator = new MyIdGenerator() + packageNamesFromFilePaths() + } } """.trimIndent() diff --git a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/ServiceTests.kt b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/ServiceTests.kt index 61f903c615c..e709bda9810 100644 --- a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/ServiceTests.kt +++ b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/ServiceTests.kt @@ -23,8 +23,10 @@ class ServiceTests { fun `customScalarsMapping is working`() { withSimpleProject(""" apollo { - packageNamesFromFilePaths() - customScalarsMapping = ["DateTime": "java.util.Date"] + service("service") { + packageNamesFromFilePaths() + customScalarsMapping = ["DateTime": "java.util.Date"] + } } """.trimIndent()) { dir -> TestUtils.executeTask("generateApolloSources", dir) @@ -36,9 +38,11 @@ class ServiceTests { fun `customScalarsMapping and mapScalar trigger an error`() { withSimpleProject(""" apollo { - packageNamesFromFilePaths() - customScalarsMapping = ["DateTime": "java.util.Date"] - mapScalar("DateTime", "java.util.Date") + service("service") { + packageNamesFromFilePaths() + customScalarsMapping = ["DateTime": "java.util.Date"] + mapScalar("DateTime", "java.util.Date") + } } """.trimIndent()) { dir -> try { @@ -54,8 +58,10 @@ class ServiceTests { fun `registering an unknown custom scalar fails`() { withSimpleProject(""" apollo { - packageNamesFromFilePaths() - customScalarsMapping = ["UnknownScalar": "java.util.Date"] + service("service") { + packageNamesFromFilePaths() + customScalarsMapping = ["UnknownScalar": "java.util.Date"] + } } """.trimIndent()) { dir -> try { @@ -72,8 +78,10 @@ class ServiceTests { fun canConfigureOutputDir() { withSimpleProject(""" apollo { - packageNamesFromFilePaths() - outputDir.set(file("build/apollo")) + service("service") { + packageNamesFromFilePaths() + outputDir.set(file("build/apollo")) + } } """.trimIndent()) { dir -> TestUtils.executeTask("generateApolloSources", dir) @@ -85,8 +93,10 @@ class ServiceTests { fun `customScalarsMapping put is working`() { withSimpleProject(""" apollo { - packageNamesFromFilePaths() - customScalarsMapping.put("DateTime", "java.util.Date") + service("service") { + packageNamesFromFilePaths() + customScalarsMapping.put("DateTime", "java.util.Date") + } } """.trimIndent()) { dir -> TestUtils.executeTask("generateApolloSources", dir) @@ -116,7 +126,9 @@ class ServiceTests { fun `useSemanticNaming defaults to true`() { withSimpleProject(""" apollo { - packageNamesFromFilePaths() + service("service") { + packageNamesFromFilePaths() + } } """.trimIndent()) { dir -> TestUtils.executeTask("generateApolloSources", dir) @@ -128,8 +140,10 @@ class ServiceTests { fun `useSemanticNaming can be turned off correctly`() { withSimpleProject(""" apollo { - packageNamesFromFilePaths() - useSemanticNaming = false + service("service") { + packageNamesFromFilePaths() + useSemanticNaming = false + } } """.trimIndent()) { dir -> TestUtils.executeTask("generateApolloSources", dir) @@ -141,7 +155,9 @@ class ServiceTests { fun `packageName works as expected`() { withSimpleProject(""" apollo { - packageName = "com.starwars" + service("service") { + packageName = "com.starwars" + } } """.trimIndent()) { dir -> TestUtils.executeTask("generateApolloSources", dir) @@ -171,8 +187,10 @@ class ServiceTests { fun `schemaFile can point to a schema file outside the module`() { withSimpleProject(""" apollo { - schemaFile = file("../schema.json") - packageName.set("com.example") + service("service") { + schemaFile = file("../schema.json") + packageName.set("com.example") + } } """.trimIndent()) { dir -> val dest = File(dir, "../schema.json") @@ -268,8 +286,10 @@ class ServiceTests { fun `operationOutput uses same id as the query`() { withSimpleProject(""" apollo { - packageNamesFromFilePaths() - generateOperationOutput.set(true) + service("service") { + packageNamesFromFilePaths() + generateOperationOutput.set(true) + } } """.trimIndent()) { dir -> val result = TestUtils.executeTask("generateApolloSources", dir) @@ -288,11 +308,13 @@ class ServiceTests { fun `operationOutputFile carries task dependencies`() { withSimpleProject(""" apollo { - generateOperationOutput.set(true) - packageNamesFromFilePaths() - operationOutputConnection { - tasks.register("customTaskService") { - inputs.file(operationOutputFile) + service("service") { + generateOperationOutput.set(true) + packageNamesFromFilePaths() + operationOutputConnection { + tasks.register("customTaskService") { + inputs.file(operationOutputFile) + } } } } @@ -351,8 +373,10 @@ class ServiceTests { fun `when generateAsInternal set to true - generated models are internal`() { val apolloConfiguration = """ apollo { - packageNamesFromFilePaths() - generateAsInternal = true + service("service") { + packageNamesFromFilePaths() + generateAsInternal = true + } } """.trimIndent() @@ -390,8 +414,10 @@ class ServiceTests { fun `when generateFragmentImplementations set to true, it generates default fragment implementation`() { withSimpleProject(""" apollo { - packageNamesFromFilePaths() - generateFragmentImplementations = true + service("service") { + packageNamesFromFilePaths() + generateFragmentImplementations = true + } } """.trimIndent()) { dir -> TestUtils.executeTask("generateApolloSources", dir) diff --git a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/UpToDateTests.kt b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/UpToDateTests.kt index 90d3e8eabf8..54909694d57 100644 --- a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/UpToDateTests.kt +++ b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/test/UpToDateTests.kt @@ -45,14 +45,10 @@ class UpToDateTests { } private fun `adding a custom scalar to the build script re-generates the CustomScalars`(dir: File) { - val apolloBlock = """ - - apollo { - customScalarsMapping = ["DateTime": "java.util.Date"] - } - """.trimIndent() - - File(dir, "build.gradle").appendText(apolloBlock) + File(dir, "build.gradle").replaceInText("packageNamesFromFilePaths()", """ + packageNamesFromFilePaths() + customScalarsMapping = ["DateTime": "java.util.Date"] + """.trimIndent()) val result = TestUtils.executeTask("generateApolloSources", dir) @@ -62,8 +58,7 @@ class UpToDateTests { TestUtils.assertFileContains(dir, "service/com/example/type/DateTime.kt", "\"java.util.Date\"") - val text = File(dir, "build.gradle").readText() - File(dir, "build.gradle").writeText(text.replace(apolloBlock, "")) + File(dir, "build.gradle").replaceInText("customScalarsMapping = [\"DateTime\": \"java.util.Date\"]", "") } @Test diff --git a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/util/TestUtils.kt b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/util/TestUtils.kt index 3df353379b0..31deae6f33d 100644 --- a/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/util/TestUtils.kt +++ b/libraries/apollo-gradle-plugin/src/test/kotlin/com/apollographql/apollo3/gradle/util/TestUtils.kt @@ -132,7 +132,9 @@ object TestUtils { fun withSimpleProject( apolloConfiguration: String = """ apollo { - packageNamesFromFilePaths() + service("service") { + packageNamesFromFilePaths() + } } """.trimIndent(), block: (File) -> Unit, diff --git a/libraries/apollo-gradle-plugin/testProjects/android-java/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/android-java/build.gradle.kts index fd54eabd9ca..21326cef7d0 100644 --- a/libraries/apollo-gradle-plugin/testProjects/android-java/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/android-java/build.gradle.kts @@ -19,5 +19,7 @@ configure { } apollo { - packageName.set("com.example") + service("service") { + packageName.set("com.example") + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/buildCache/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/buildCache/build.gradle.kts index 045358a02e7..3386bcfa6eb 100644 --- a/libraries/apollo-gradle-plugin/testProjects/buildCache/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/buildCache/build.gradle.kts @@ -4,5 +4,7 @@ plugins { } apollo { - packageName.set("com.example") + service("service") { + packageName.set("com.example") + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/configuration-cache/leaf/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/configuration-cache/leaf/build.gradle.kts index b1754cef858..a69dd5dd46b 100644 --- a/libraries/apollo-gradle-plugin/testProjects/configuration-cache/leaf/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/configuration-cache/leaf/build.gradle.kts @@ -12,5 +12,7 @@ dependencies { } apollo { - packageName.set("com.example.leaf") + service("service") { + packageName.set("com.example.leaf") + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/configuration-cache/root/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/configuration-cache/root/build.gradle.kts index 59cde5ce616..f6f42b524a6 100644 --- a/libraries/apollo-gradle-plugin/testProjects/configuration-cache/root/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/configuration-cache/root/build.gradle.kts @@ -4,9 +4,11 @@ plugins { } apollo { - packageName.set("com.example") - introspection { - this.endpointUrl.set("ENDPOINT") - this.schemaFile.set(file("schema.json")) + service("service") { + packageName.set("com.example") + introspection { + this.endpointUrl.set("ENDPOINT") + this.schemaFile.set(file("schema.json")) + } } } diff --git a/libraries/apollo-gradle-plugin/testProjects/defaultVersion/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/defaultVersion/build.gradle.kts index 09e873143e7..4d8f1a21a1a 100644 --- a/libraries/apollo-gradle-plugin/testProjects/defaultVersion/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/defaultVersion/build.gradle.kts @@ -9,5 +9,7 @@ dependencies { } apollo { - packageNamesFromFilePaths() + service("service") { + packageNamesFromFilePaths() + } } \ No newline at end of file diff --git a/libraries/apollo-gradle-plugin/testProjects/deprecationWarnings/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/deprecationWarnings/build.gradle.kts index ac94629d106..934d658aa69 100644 --- a/libraries/apollo-gradle-plugin/testProjects/deprecationWarnings/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/deprecationWarnings/build.gradle.kts @@ -4,5 +4,7 @@ plugins { } apollo { - packageName.set("com.example") + service("service") { + packageName.set("com.example") + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/executable-schema-file/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/executable-schema-file/build.gradle.kts index 79347b258fe..67317e1015c 100644 --- a/libraries/apollo-gradle-plugin/testProjects/executable-schema-file/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/executable-schema-file/build.gradle.kts @@ -4,5 +4,7 @@ plugins { } apollo { - packageNamesFromFilePaths() + service("service") { + packageNamesFromFilePaths() + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/java-only/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/java-only/build.gradle.kts index 93cd31dcf82..ccf798b95e4 100644 --- a/libraries/apollo-gradle-plugin/testProjects/java-only/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/java-only/build.gradle.kts @@ -5,7 +5,9 @@ plugins { } apollo { - packageName.set("com.example") - mapScalarToJavaLong("Long") - mapScalar("ID", "java.lang.Long", "com.example.Adapters.ID_ADAPTER") + service("service") { + packageName.set("com.example") + mapScalarToJavaLong("Long") + mapScalar("ID", "java.lang.Long", "com.example.Adapters.ID_ADAPTER") + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/kotlin-android-plugin-version/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/kotlin-android-plugin-version/build.gradle.kts index a3b27fab9a9..351166074c8 100644 --- a/libraries/apollo-gradle-plugin/testProjects/kotlin-android-plugin-version/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/kotlin-android-plugin-version/build.gradle.kts @@ -20,6 +20,8 @@ dependencies { } apollo { - packageName.set("com.example") + service("service") { + packageName.set("com.example") + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/mismatchedVersions/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/mismatchedVersions/build.gradle.kts index bef04c6ae2f..6e7bfcb6484 100644 --- a/libraries/apollo-gradle-plugin/testProjects/mismatchedVersions/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/mismatchedVersions/build.gradle.kts @@ -7,5 +7,7 @@ dependencies { } apollo { - packageNamesFromFilePaths() + service("service") { + packageNamesFromFilePaths() + } } \ No newline at end of file diff --git a/libraries/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar-defined-in-leaf/leaf/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar-defined-in-leaf/leaf/build.gradle.kts index ca416018fbc..74fdf83f75a 100644 --- a/libraries/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar-defined-in-leaf/leaf/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar-defined-in-leaf/leaf/build.gradle.kts @@ -13,6 +13,8 @@ dependencies { } apollo { - packageName.set("com.library") - mapScalar("Long", "java.lang.Long") + service("service") { + packageName.set("com.library") + mapScalar("Long", "java.lang.Long") + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar-defined-in-leaf/root/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar-defined-in-leaf/root/build.gradle.kts index af01823393e..f44c19f260b 100644 --- a/libraries/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar-defined-in-leaf/root/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar-defined-in-leaf/root/build.gradle.kts @@ -11,7 +11,9 @@ dependencies { } apollo { - packageName.set("com.library") - generateApolloMetadata.set(true) - mapScalar("Date", "java.util.Date") + service("service") { + packageName.set("com.library") + generateApolloMetadata.set(true) + mapScalar("Date", "java.util.Date") + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar/leaf/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar/leaf/build.gradle.kts index 2254a6fc32d..b3a11c22940 100644 --- a/libraries/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar/leaf/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar/leaf/build.gradle.kts @@ -18,5 +18,7 @@ application { } apollo { - packageName.set("com.library") + service("service") { + packageName.set("com.library") + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar/root/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar/root/build.gradle.kts index 9974a05eec4..62f70c2fa78 100644 --- a/libraries/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar/root/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar/root/build.gradle.kts @@ -12,8 +12,10 @@ dependencies { } apollo { - packageName.set("com.library") - generateApolloMetadata.set(true) - mapScalar("Date", "java.util.Date") - mapScalar("ID", "com.library.MyID", "com.library.MyIDAdapter()") + service("service") { + packageName.set("com.library") + generateApolloMetadata.set(true) + mapScalar("Date", "java.util.Date") + mapScalar("ID", "com.library.MyID", "com.library.MyIDAdapter()") + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/multi-modules-diamond/leaf/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/multi-modules-diamond/leaf/build.gradle.kts index e45d1343289..fddd88ca541 100644 --- a/libraries/apollo-gradle-plugin/testProjects/multi-modules-diamond/leaf/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/multi-modules-diamond/leaf/build.gradle.kts @@ -21,5 +21,7 @@ application { } apollo { - packageNamesFromFilePaths() + service("service") { + packageNamesFromFilePaths() + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/multi-modules-diamond/node1/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/multi-modules-diamond/node1/build.gradle.kts index aa0516b76fd..86a69d00f9e 100644 --- a/libraries/apollo-gradle-plugin/testProjects/multi-modules-diamond/node1/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/multi-modules-diamond/node1/build.gradle.kts @@ -13,6 +13,8 @@ dependencies { } apollo { - packageNamesFromFilePaths() - generateApolloMetadata.set(true) + service("service") { + packageNamesFromFilePaths() + generateApolloMetadata.set(true) + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/multi-modules-diamond/node2/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/multi-modules-diamond/node2/build.gradle.kts index aa0516b76fd..86a69d00f9e 100644 --- a/libraries/apollo-gradle-plugin/testProjects/multi-modules-diamond/node2/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/multi-modules-diamond/node2/build.gradle.kts @@ -13,6 +13,8 @@ dependencies { } apollo { - packageNamesFromFilePaths() - generateApolloMetadata.set(true) + service("service") { + packageNamesFromFilePaths() + generateApolloMetadata.set(true) + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/multi-modules-diamond/root/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/multi-modules-diamond/root/build.gradle.kts index 45ff8740d55..27a07d741e6 100644 --- a/libraries/apollo-gradle-plugin/testProjects/multi-modules-diamond/root/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/multi-modules-diamond/root/build.gradle.kts @@ -12,7 +12,9 @@ dependencies { } apollo { - packageNamesFromFilePaths() - generateApolloMetadata.set(true) - customScalarsMapping.set(mapOf("Date" to "java.util.Date")) + service("service") { + packageNamesFromFilePaths() + generateApolloMetadata.set(true) + customScalarsMapping.set(mapOf("Date" to "java.util.Date")) + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/multi-modules-duplicates/node1/impl/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/multi-modules-duplicates/node1/impl/build.gradle.kts index 1fb1dd3e306..be2854decf4 100644 --- a/libraries/apollo-gradle-plugin/testProjects/multi-modules-duplicates/node1/impl/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/multi-modules-duplicates/node1/impl/build.gradle.kts @@ -13,5 +13,7 @@ dependencies { } apollo { - packageNamesFromFilePaths() + service("service") { + packageNamesFromFilePaths() + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/multi-modules-duplicates/node2/impl/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/multi-modules-duplicates/node2/impl/build.gradle.kts index 1fb1dd3e306..be2854decf4 100644 --- a/libraries/apollo-gradle-plugin/testProjects/multi-modules-duplicates/node2/impl/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/multi-modules-duplicates/node2/impl/build.gradle.kts @@ -13,5 +13,7 @@ dependencies { } apollo { - packageNamesFromFilePaths() + service("service") { + packageNamesFromFilePaths() + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/multi-modules-duplicates/root/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/multi-modules-duplicates/root/build.gradle.kts index 15650d76da9..6d6900147e7 100644 --- a/libraries/apollo-gradle-plugin/testProjects/multi-modules-duplicates/root/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/multi-modules-duplicates/root/build.gradle.kts @@ -12,8 +12,10 @@ dependencies { } apollo { - alwaysGenerateTypesMatching.set(listOf("Cat")) - packageNamesFromFilePaths() - generateApolloMetadata.set(true) - customScalarsMapping.set(mapOf("Date" to "java.util.Date")) + service("service") { + alwaysGenerateTypesMatching.set(listOf("Cat")) + packageNamesFromFilePaths() + generateApolloMetadata.set(true) + customScalarsMapping.set(mapOf("Date" to "java.util.Date")) + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/multi-modules-transitive/leaf/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/multi-modules-transitive/leaf/build.gradle.kts index a3d81fefb09..c51a7beba99 100644 --- a/libraries/apollo-gradle-plugin/testProjects/multi-modules-transitive/leaf/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/multi-modules-transitive/leaf/build.gradle.kts @@ -19,5 +19,7 @@ application { } apollo { - packageNamesFromFilePaths() + service("service") { + packageNamesFromFilePaths() + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/multi-modules-transitive/node/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/multi-modules-transitive/node/build.gradle.kts index 91ba9b44658..cd76d0d24f2 100644 --- a/libraries/apollo-gradle-plugin/testProjects/multi-modules-transitive/node/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/multi-modules-transitive/node/build.gradle.kts @@ -11,6 +11,8 @@ dependencies { } apollo { - packageNamesFromFilePaths() - generateApolloMetadata.set(true) + service("service") { + packageNamesFromFilePaths() + generateApolloMetadata.set(true) + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/multi-modules-transitive/root/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/multi-modules-transitive/root/build.gradle.kts index 45ff8740d55..27a07d741e6 100644 --- a/libraries/apollo-gradle-plugin/testProjects/multi-modules-transitive/root/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/multi-modules-transitive/root/build.gradle.kts @@ -12,7 +12,9 @@ dependencies { } apollo { - packageNamesFromFilePaths() - generateApolloMetadata.set(true) - customScalarsMapping.set(mapOf("Date" to "java.util.Date")) + service("service") { + packageNamesFromFilePaths() + generateApolloMetadata.set(true) + customScalarsMapping.set(mapOf("Date" to "java.util.Date")) + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/multi-modules/leaf/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/multi-modules/leaf/build.gradle.kts index 4354af148c9..cb451c8c63a 100644 --- a/libraries/apollo-gradle-plugin/testProjects/multi-modules/leaf/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/multi-modules/leaf/build.gradle.kts @@ -18,5 +18,7 @@ application { } apollo { - packageNamesFromFilePaths() + service("service") { + packageNamesFromFilePaths() + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/multi-modules/root/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/multi-modules/root/build.gradle.kts index 45ff8740d55..27a07d741e6 100644 --- a/libraries/apollo-gradle-plugin/testProjects/multi-modules/root/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/multi-modules/root/build.gradle.kts @@ -12,7 +12,9 @@ dependencies { } apollo { - packageNamesFromFilePaths() - generateApolloMetadata.set(true) - customScalarsMapping.set(mapOf("Date" to "java.util.Date")) + service("service") { + packageNamesFromFilePaths() + generateApolloMetadata.set(true) + customScalarsMapping.set(mapOf("Date" to "java.util.Date")) + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/multiplatform/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/multiplatform/build.gradle.kts index a0685793b8d..6df0939d9cb 100644 --- a/libraries/apollo-gradle-plugin/testProjects/multiplatform/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/multiplatform/build.gradle.kts @@ -29,5 +29,7 @@ configure { } apollo { - packageNamesFromFilePaths() + service("service") { + packageNamesFromFilePaths() + } } diff --git a/libraries/apollo-gradle-plugin/testProjects/operationIds/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/operationIds/build.gradle.kts index 2de1ca3461c..e84a0cc2883 100644 --- a/libraries/apollo-gradle-plugin/testProjects/operationIds/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/operationIds/build.gradle.kts @@ -8,16 +8,18 @@ plugins { } apollo { - val customOperationOutputGenerator = object: OperationOutputGenerator { - override fun generate(operationDescriptorList: Collection): OperationOutput { - return operationDescriptorList.map { - "${it.name}CustomId" to it - }.toMap() + service("service") { + val customOperationOutputGenerator = object : OperationOutputGenerator { + override fun generate(operationDescriptorList: Collection): OperationOutput { + return operationDescriptorList.map { + "${it.name}CustomId" to it + }.toMap() + } + + override val version = "OperationOutputGenerator-v1" } - override val version = "OperationOutputGenerator-v1" + packageNamesFromFilePaths() + operationOutputGenerator.set(customOperationOutputGenerator) } - - packageNamesFromFilePaths() - operationOutputGenerator.set(customOperationOutputGenerator) } \ No newline at end of file diff --git a/libraries/apollo-gradle-plugin/testProjects/register-operations/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/register-operations/build.gradle.kts index 3a71149c807..042d81fc0f3 100644 --- a/libraries/apollo-gradle-plugin/testProjects/register-operations/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/register-operations/build.gradle.kts @@ -9,10 +9,12 @@ dependencies { } apollo { - packageName.set("com.example") - registerOperations { - key.set("unused") - graph.set("unused") - graphVariant.set("current") + service("service") { + packageName.set("com.example") + registerOperations { + key.set("unused") + graph.set("unused") + graphVariant.set("current") + } } } diff --git a/libraries/apollo-gradle-plugin/testProjects/testSourceSet/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/testSourceSet/build.gradle.kts index cffc9b42e7b..8d4f2f9a400 100644 --- a/libraries/apollo-gradle-plugin/testProjects/testSourceSet/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/testSourceSet/build.gradle.kts @@ -9,8 +9,10 @@ dependencies { } apollo { - packageNamesFromFilePaths() - outputDirConnection { - connectToKotlinSourceSet("test") + service("service") { + packageNamesFromFilePaths() + outputDirConnection { + connectToKotlinSourceSet("test") + } } }