User: rednesto Date: 11 Apr 23 18:20 Revision: 9f5ca6f6a261ede99d06451d946084d3bd0e4c12 Summary: Run gradle tasks after the project is imported Attempt to fix #1998 and fix #1989 TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=8427&personal=false Index: src/main/kotlin/creator/buildsystem/gradle-steps.kt =================================================================== --- src/main/kotlin/creator/buildsystem/gradle-steps.kt (revision 10c982cf2d3f8f12c35e860b986dd03370fcd860) +++ src/main/kotlin/creator/buildsystem/gradle-steps.kt (revision 9f5ca6f6a261ede99d06451d946084d3bd0e4c12) @@ -20,7 +20,7 @@ import com.demonwav.mcdev.util.invokeAndWait import com.demonwav.mcdev.util.invokeLater import com.demonwav.mcdev.util.mapFirstNotNull -import com.demonwav.mcdev.util.runGradleTaskAndWait +import com.demonwav.mcdev.util.runGradleTask import com.demonwav.mcdev.util.runWriteAction import com.demonwav.mcdev.util.runWriteTask import com.demonwav.mcdev.util.virtualFileOrError @@ -43,6 +43,7 @@ import com.intellij.psi.PsiManager import java.nio.file.Path import java.util.concurrent.CountDownLatch +import org.jetbrains.kotlin.idea.util.runWhenSmart import org.jetbrains.plugins.gradle.service.execution.GradleExternalTaskConfigurationType import org.jetbrains.plugins.gradle.service.execution.GradleRunConfiguration import org.jetbrains.plugins.gradle.service.project.open.canLinkAndRefreshGradleProject @@ -63,11 +64,13 @@ override fun perform(project: Project) { val outputDirectory = context.projectFileDirectory - runGradleTaskAndWait(project, Path.of(outputDirectory)) { settings -> + project.runWhenSmart { + runGradleTask(project, Path.of(outputDirectory)) { settings -> - settings.taskNames = listOf(task) - } - } -} + settings.taskNames = listOf(task) + } + } + } +} class GradleWrapperStep(parent: NewProjectWizardStep) : AbstractRunGradleTaskStep(parent) { override val task = "wrapper"