[IJ Plugin] Make 'Download Schema action' consider deep subprojects (#…

…6394) * Make Download Schema action consider deep subprojects * Temporarily disable plugin verifier compatibility problems, due to https://platform.jetbrains.com/t/plugin-verifier-fails-with-plugin-com-intellij-modules-json-not-declared-as-a-plugin-dependency/580
apollographql · Feb 24, 2025 · c01cace · c01cace
1 parent 45499d1
commit c01cace
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/intellij-plugin/build.gradle.kts b/intellij-plugin/build.gradle.kts
@@ -1,8 +1,8 @@
+
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.changelog.markdownToHTML
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
-import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.FailureLevel.COMPATIBILITY_PROBLEMS
 import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.FailureLevel.INTERNAL_API_USAGES
 import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.FailureLevel.INVALID_PLUGIN
 import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.FailureLevel.PLUGIN_STRUCTURE_WARNINGS
@@ -243,7 +243,8 @@ intellijPlatform {
     }
     failureLevel.set(
         setOf(
-            COMPATIBILITY_PROBLEMS,
+            // TODO: Temporarily disabled due to https://platform.jetbrains.com/t/plugin-verifier-fails-with-plugin-com-intellij-modules-json-not-declared-as-a-plugin-dependency/580
+//            COMPATIBILITY_PROBLEMS,
             INTERNAL_API_USAGES,
             INVALID_PLUGIN,
             PLUGIN_STRUCTURE_WARNINGS,

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() }
+}