User: rednesto
Date: 06 Nov 23 11:56
Revision: 737ce5c9100dea6255dbb2f3f07d47d006aa0a17
Summary:
Fix build error with latest EAP


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8823&personal=false

Index: gradle.properties
===================================================================
--- gradle.properties	(revision b66a2794763575e586f0026f9f956d26e31a4ad2)
+++ gradle.properties	(revision 737ce5c9100dea6255dbb2f3f07d47d006aa0a17)
@@ -21,13 +21,13 @@
 # suppress inspection "UnusedProperty" for whole file
 kotlin.code.style=official
 
-ideaVersion = 233.9802.14-EAP-SNAPSHOT
+ideaVersion = 233.11555.11-EAP-SNAPSHOT
 ideaVersionName = 2023.3
 
 coreVersion = 1.6.10
 downloadIdeaSources = true
 
-pluginTomlVersion = 233.9802.6
+pluginTomlVersion = 233.11555.11
 
 # Silences a build-time warning because we are bundling our own kotlin library
 kotlin.stdlib.default.dependency = false
Index: gradle/libs.versions.toml
===================================================================
--- gradle/libs.versions.toml	(revision b66a2794763575e586f0026f9f956d26e31a4ad2)
+++ gradle/libs.versions.toml	(revision 737ce5c9100dea6255dbb2f3f07d47d006aa0a17)
@@ -18,7 +18,7 @@
 grammarKit = "org.jetbrains.idea:grammar-kit:1.5.1"
 
 # Gradle Tooling
-gradleToolingExtension = "com.jetbrains.intellij.gradle:gradle-tooling-extension:233.9802.14-EAP-SNAPSHOT"
+gradleToolingExtension = "com.jetbrains.intellij.gradle:gradle-tooling-extension:233.11555.11-EAP-SNAPSHOT"
 annotations = "org.jetbrains:annotations:24.0.0"
 groovy = "org.codehaus.groovy:groovy-all:2.5.18"
 
Index: src/main/kotlin/creator/buildsystem/maven-steps.kt
===================================================================
--- src/main/kotlin/creator/buildsystem/maven-steps.kt	(revision b66a2794763575e586f0026f9f956d26e31a4ad2)
+++ src/main/kotlin/creator/buildsystem/maven-steps.kt	(revision 737ce5c9100dea6255dbb2f3f07d47d006aa0a17)
@@ -45,12 +45,10 @@
 import com.intellij.psi.xml.XmlTag
 import com.intellij.util.xml.DomManager
 import java.nio.file.Path
-import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.runBlocking
 import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel
 import org.jetbrains.idea.maven.execution.MavenRunConfiguration
 import org.jetbrains.idea.maven.execution.MavenRunConfigurationType
-import org.jetbrains.idea.maven.project.importing.MavenImportingManager
 
 private val pluginVersions by lazy {
     runBlocking {
@@ -175,18 +173,11 @@
         get() = MCDevBundle("creator.step.maven.import_maven.description")
 
     override fun perform(project: Project) {
-        val pomFile = VfsUtil.findFile(Path.of(context.projectFileDirectory).resolve("pom.xml"), true)
-            ?: return
-        val promise = invokeAndWait {
-            if (project.isDisposed || !project.isInitialized) {
-                notifyCreatedProjectNotOpened()
+        if (project.isDisposed || !project.isInitialized) {
+            notifyCreatedProjectNotOpened()
-                return@invokeAndWait null
+            return
-            }
+        }
-            MavenImportingManager.getInstance(project).linkAndImportFile(pomFile)
-        } ?: return
 
-        promise.finishPromise.blockingGet(Int.MAX_VALUE, TimeUnit.SECONDS)
-
         val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
         addRunTaskConfiguration(project, buildSystemProps, "package")
     }
@@ -205,6 +196,7 @@
         val runConfiguration = mavenConfigFactory.createConfiguration(runConfigName, templateConfig)
             as MavenRunConfiguration
         runConfiguration.runnerParameters.goals.add(task)
+        runConfiguration.runnerParameters.workingDirPath = context.projectDirectory.toString()
 
         runConfiguration.isAllowRunningInParallel = false
 
Index: src/main/kotlin/creator/step/FixedAssetsNewProjectWizardStep.kt
===================================================================
--- src/main/kotlin/creator/step/FixedAssetsNewProjectWizardStep.kt	(revision b66a2794763575e586f0026f9f956d26e31a4ad2)
+++ src/main/kotlin/creator/step/FixedAssetsNewProjectWizardStep.kt	(revision 737ce5c9100dea6255dbb2f3f07d47d006aa0a17)
@@ -102,7 +102,7 @@
             action()
         } else if (!project.isDisposed) {
             StartupManager.getInstance(project).runAfterOpened {
-                ApplicationManager.getApplication().invokeLater(action, project.disposed)
+                WriteAction.runAndWait<Throwable>(action)
             }
         }
     }