Update gratatouille so that we can have an apolloTasks configuration that hold the classpath for the tasks (#6701)

Author: martinbonnin

gradle/libraries.toml

@@ -24,7 +24,10 @@ atomicfu = "0.26.0"
 compat-patrouille = "0.0.0"
 compose = "1.5.1"
 guava = "31.1-jre"
-gratatouille = "0.0.10"
+# This is used at build time only, and it's ok to resolve SNAPSHOTS
+gratatouille = "0.1.3-SNAPSHOT-5760abde21dbc0bea26bb4a401ca5fc69067fa80"
+# This is a transitive dependency of apollo-gradle-plugin and therefore cannot use SNAPSHOTs
+gratatouille-runtime = "0.1.2"
 javaPoet = "1.13.0"
 jetbrains-annotations = "24.0.1"
 junit = "4.13.2"
@@ -99,6 +102,8 @@ dgp = "com.gradle:develocity-gradle-plugin:4.1.1" # // sync with settings.gradle
 google-testing-compile = { group = "com.google.testing.compile", name = "compile-testing", version = "0.19" }
 google-testparameterinjector = { group = "com.google.testparameterinjector", name = "test-parameter-injector", version = "1.11" }
 gratatouille = { group = "com.gradleup.gratatouille", name = "gratatouille-gradle-plugin", version.ref = "gratatouille" }
+gratatouille-wiring-runtime = { group = "com.gradleup.gratatouille", name = "gratatouille-wiring-runtime", version.ref = "gratatouille-runtime" }
+gratatouille-tasks-runtime = { group = "com.gradleup.gratatouille", name = "gratatouille-tasks-runtime", version.ref = "gratatouille-runtime" }
 
 #
 # See https://github.com/gradle/gradle/issues/1835

gradle/repositories.gradle.kts

@@ -31,21 +31,33 @@ listOf(pluginManagement.repositories, dependencyResolutionManagement.repositorie
         includeModuleByRegex("androidx\\..*", ".*")
       }
     }
-
+    // This is used at build time but not part of pluginManagement
     maven("https://storage.googleapis.com/gradleup/m2") {
       content {
-        includeGroup("com.gradleup.librarian")
-        includeGroup("com.gradleup.nmcp")
-        includeGroup("com.gradleup.nmcp.aggregation")
+        includeModule("com.gradleup.gratatouille", "gratatouille-processor")
       }
     }
 
-    exclusiveContent {
-      forRepository(::gradlePluginPortal)
-      filter {
-        includeModule("org.jetbrains.kotlinx", "kotlinx-benchmark-plugin")
-        includeModule("com.github.ben-manes", "gradle-versions-plugin")
-        includeModule("com.gradle", "develocity-gradle-plugin")
+    if (rootProject.name == "build-logic" || it === pluginManagement.repositories) {
+      // repositories only used at build time
+      exclusiveContent {
+        forRepository(::gradlePluginPortal)
+        filter {
+          includeModule("org.jetbrains.kotlinx", "kotlinx-benchmark-plugin")
+          includeModule("com.github.ben-manes", "gradle-versions-plugin")
+          includeModule("com.gradle", "develocity-gradle-plugin")
+        }
+      }
+
+      maven("https://storage.googleapis.com/gradleup/m2") {
+        content {
+          includeGroup("com.gradleup.librarian")
+          includeGroup("com.gradleup.nmcp")
+          includeGroup("com.gradleup.nmcp.aggregat=ion")
+          includeGroup("com.gradleup.gratatouille")
+          includeGroup("com.gradleup.gratatouille.tasks")
+          includeGroup("com.gradleup.gratatouille.wiring")
+        }
       }
     }
   }

libraries/apollo-gradle-plugin-external/build.gradle.kts

@@ -1,5 +1,4 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   id("org.jetbrains.kotlin.jvm")
@@ -14,13 +13,17 @@ apolloLibrary(
 )
 
 gratatouille {
-  codeGeneration()
+  codeGeneration {
+    addDependencies.set(false)
+  }
   pluginMarker("com.apollographql.apollo.external")
 }
 
 dependencies {
   compileOnly(libs.gradle.api.min)
-  compileOnly(libs.kotlin.plugin.min)
+
+  implementation(libs.gratatouille.wiring.runtime)
+  implementation(libs.gratatouille.tasks.runtime)
 
   implementation(project(":apollo-annotations"))
   api(project(":apollo-gradle-plugin"))

libraries/apollo-gradle-plugin-tasks/build.gradle.kts

@@ -16,26 +16,17 @@ dependencies {
   implementation(project(":apollo-compiler"))
   implementation(project(":apollo-tooling"))
   implementation(project(":apollo-ast"))
+  implementation(libs.gratatouille.tasks.runtime)
   implementation(libs.asm)
   implementation(libs.kotlinx.serialization.json)
 }
 
 gratatouille {
   codeGeneration {
-    /**
-     * Workaround for https://github.com/GradleUp/gratatouille/pull/52
-     */
-    configurations.configureEach {
-      if (name == "gratatouilleApiElements") {
-        artifacts.configureEach {
-          this as ConfigurablePublishArtifact
-          if (extension.isNullOrEmpty()) {
-            extension = "zip"
-          }
-        }
-      }
+    addDependencies = false
+    classLoaderIsolation {
+      configurationName = "apolloTasks"
     }
-    classLoaderIsolation()
   }
 }
 

libraries/apollo-gradle-plugin/build.gradle.kts

@@ -15,7 +15,9 @@ apolloLibrary(
 )
 
 gratatouille {
-  codeGeneration()
+  codeGeneration {
+    addDependencies = false
+  }
   pluginMarker("com.apollographql.apollo")
 }
 
@@ -28,6 +30,8 @@ dependencies {
 
   compileOnly(libs.gradle.api.min)
   implementation(project(":apollo-annotations"))
+  implementation(libs.gratatouille.wiring.runtime)
+
   testImplementation(project(":apollo-ast"))
   testImplementation(libs.junit)
   testImplementation(libs.truth)