File tree 4 files changed +9
-7
lines changed
src/main/kotlin/com/apollographql/ijplugin/gradle
4 files changed +9
-7
lines changed Original file line number Diff line number Diff line change
1
+
1
2
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
2
3
import org.gradle.api.tasks.testing.logging.TestLogEvent
3
4
import org.jetbrains.changelog.markdownToHTML
4
5
import org.jetbrains.intellij.platform.gradle.TestFrameworkType
5
- import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.FailureLevel.COMPATIBILITY_PROBLEMS
6
6
import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.FailureLevel.INTERNAL_API_USAGES
7
7
import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.FailureLevel.INVALID_PLUGIN
8
8
import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.FailureLevel.PLUGIN_STRUCTURE_WARNINGS
@@ -243,7 +243,8 @@ intellijPlatform {
243
243
}
244
244
failureLevel.set(
245
245
setOf (
246
- COMPATIBILITY_PROBLEMS ,
246
+ // 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
247
+ // COMPATIBILITY_PROBLEMS,
247
248
INTERNAL_API_USAGES ,
248
249
INVALID_PLUGIN ,
249
250
PLUGIN_STRUCTURE_WARNINGS ,
Original file line number Diff line number Diff line change @@ -62,7 +62,7 @@ private class DownloadSchemaTask(project: Project) : Task.Backgroundable(
62
62
}
63
63
} ? : return
64
64
65
- val allDownloadSchemaTasks: List <String > = ( rootGradleProject.children + rootGradleProject )
65
+ val allDownloadSchemaTasks: List <String > = rootGradleProject.allChildrenRecursively( )
66
66
.flatMap { gradleProject -> gradleProject.tasks.filter { task -> task.name.matches(DOWNLOAD_SCHEMA_TASK_REGEX ) } }
67
67
.map { it.name }
68
68
.distinct()
Original file line number Diff line number Diff line change @@ -302,10 +302,6 @@ class GradleToolingModelService(
302
302
}
303
303
}
304
304
305
- private fun GradleProject.allChildrenRecursively (): List <GradleProject > {
306
- return listOf (this ) + children.flatMap { it.allChildrenRecursively() }
307
- }
308
-
309
305
private val ApolloGradleToolingModel .projectPathCompat: String
310
306
get() = if (versionMinor >= 3 ) {
311
307
projectPath
Original file line number Diff line number Diff line change @@ -5,6 +5,7 @@ import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
5
5
import com.intellij.openapi.module.Module
6
6
import com.intellij.openapi.module.ModuleManager
7
7
import com.intellij.openapi.project.Project
8
+ import org.gradle.tooling.model.GradleProject
8
9
9
10
const val CODEGEN_GRADLE_TASK_NAME = " generateApolloSources"
10
11
@@ -23,3 +24,7 @@ fun Project.getGradleRootPath(): String? {
23
24
if (rootProjectPath == null ) logw(" Could not get Gradle root project path" )
24
25
return rootProjectPath
25
26
}
27
+
28
+ fun GradleProject.allChildrenRecursively (): List <GradleProject > {
29
+ return listOf (this ) + children.flatMap { it.allChildrenRecursively() }
30
+ }
You can’t perform that action at this time.
0 commit comments