From 07e1abe8fa135f8454ff89c247f2e527161791a2 Mon Sep 17 00:00:00 2001 From: Sergei Vorobyov Date: Tue, 7 Jul 2026 19:09:02 +0200 Subject: [PATCH] IDEA-390110 [gradle] fix: migrate IdeaKpmProjectProvider to resilient sync API (cherry picked from commit 62dd82cb08f63460c409f3fce1232720fea6b5ef) IJ-CR-214557 GitOrigin-RevId: 8b5a4c74bbb457d10a88d1eccea8b3ac6b21603a --- .../idea/gradleTooling/IdeaKpmProjectProvider.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/kotlin/gradle/gradle-tooling/impl/src/org/jetbrains/kotlin/idea/gradleTooling/IdeaKpmProjectProvider.kt b/plugins/kotlin/gradle/gradle-tooling/impl/src/org/jetbrains/kotlin/idea/gradleTooling/IdeaKpmProjectProvider.kt index 8210cbb175d9..c8b009329db8 100644 --- a/plugins/kotlin/gradle/gradle-tooling/impl/src/org/jetbrains/kotlin/idea/gradleTooling/IdeaKpmProjectProvider.kt +++ b/plugins/kotlin/gradle/gradle-tooling/impl/src/org/jetbrains/kotlin/idea/gradleTooling/IdeaKpmProjectProvider.kt @@ -1,8 +1,8 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.gradleTooling -import com.intellij.gradle.toolingExtension.impl.util.GradleModelProviderUtil -import org.gradle.tooling.BuildController +import com.intellij.gradle.toolingExtension.modelAction.GradleModelController +import com.intellij.gradle.toolingExtension.modelAction.GradleModelController.GradleModelFetchRequest.GradleExecutionMode import org.gradle.tooling.model.gradle.GradleBuild import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProjectContainer import org.jetbrains.plugins.gradle.model.ProjectImportModelProvider @@ -11,11 +11,14 @@ import org.jetbrains.plugins.gradle.model.ProjectImportModelProvider.GradleModel object IdeaKpmProjectProvider : ProjectImportModelProvider { override fun populateModels( - controller: BuildController, + modelController: GradleModelController, buildModels: Collection, modelConsumer: GradleModelConsumer ) { - GradleModelProviderUtil.buildModelsInSequence(controller, buildModels, IdeaKpmProjectContainer::class.java, modelConsumer) + modelController.fetchRequest(buildModels, IdeaKpmProjectContainer::class.java) + .suppressFailures() + .executionMode(GradleExecutionMode.SEQUENTIAL) + .execute(modelConsumer) } }