Make Download Schema action consider deep subprojects

apollographql · Feb 24, 2025 · 3a0b733 · 3a0b733
1 parent 45499d1
commit 3a0b733
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/DownloadSchemaAction.kt b/intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/DownloadSchemaAction.kt
@@ -62,7 +62,7 @@ private class DownloadSchemaTask(project: Project) : Task.Backgroundable(
       }
     } ?: return
 
-    val allDownloadSchemaTasks: List<String> = (rootGradleProject.children + rootGradleProject)
+    val allDownloadSchemaTasks: List<String> = rootGradleProject.allChildrenRecursively()
         .flatMap { gradleProject -> gradleProject.tasks.filter { task -> task.name.matches(DOWNLOAD_SCHEMA_TASK_REGEX) } }
         .map { it.name }
         .distinct()

diff --git a/...lij-plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/GradleToolingModelService.kt b/...lij-plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/GradleToolingModelService.kt
@@ -302,10 +302,6 @@ class GradleToolingModelService(
   }
 }
 
-private fun GradleProject.allChildrenRecursively(): List<GradleProject> {
-  return listOf(this) + children.flatMap { it.allChildrenRecursively() }
-}
-
 private val ApolloGradleToolingModel.projectPathCompat: String
   get() = if (versionMinor >= 3) {
     projectPath

diff --git a/intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/GradleUtil.kt b/intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/GradleUtil.kt
@@ -5,6 +5,7 @@ import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.project.Project
+import org.gradle.tooling.model.GradleProject
 
 const val CODEGEN_GRADLE_TASK_NAME = "generateApolloSources"
 
@@ -23,3 +24,7 @@ fun Project.getGradleRootPath(): String? {
   if (rootProjectPath == null) logw("Could not get Gradle root project path")
   return rootProjectPath
 }
+
+fun GradleProject.allChildrenRecursively(): List<GradleProject> {
+  return listOf(this) + children.flatMap { it.allChildrenRecursively() }
+}