Merge pull request #397 from JetBrains-Research/pderakhshanfar/bug-fi…

…x/Resolve-marketplace-issues Resolve marketplace issues
JetBrains-Research · Oct 16, 2024 · e1553b1 · e1553b1
2 parents c5b52c3 + 4bcc7e0
commit e1553b1
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -93,6 +93,10 @@ if (spaceCredentialsProvided()) {
         dependsOn("checkCredentials")
     }
 
+    tasks.named<Jar>(hasGrazieAccess.jarTaskName) {
+        exclude("**/plugin.xml")
+    }
+
     // add build of new source set as the part of UI testing
     tasks.prepareTestSandbox.configure {
         dependsOn(hasGrazieAccess.jarTaskName)

diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,7 @@ evosuiteVersion = 1.0.5
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
-pluginSinceBuild = 241
+pluginSinceBuild = 242
 pluginUntilBuild = 242.*
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties

diff --git a/java/build.gradle.kts b/java/build.gradle.kts
@@ -33,6 +33,7 @@ intellijPlatform {
 tasks.named("verifyPlugin") { enabled = false }
 tasks.named("runIde") { enabled = false }
 tasks.named("prepareJarSearchableOptions") { enabled = false }
+tasks.named("publishPlugin") { enabled = false }
 
 kotlin {
     jvmToolchain(rootProject.properties["jvmToolchainVersion"].toString().toInt())

diff --git a/kotlin/build.gradle.kts b/kotlin/build.gradle.kts
@@ -34,6 +34,7 @@ intellijPlatform {
 tasks.named("verifyPlugin") { enabled = false }
 tasks.named("runIde") { enabled = false }
 tasks.named("prepareJarSearchableOptions") { enabled = false }
+tasks.named("publishPlugin") { enabled = false }
 
 tasks {
     buildSearchableOptions {

diff --git a/langwrappers/build.gradle.kts b/langwrappers/build.gradle.kts
@@ -36,6 +36,7 @@ intellijPlatform {
 tasks.named("verifyPlugin") { enabled = false }
 tasks.named("runIde") { enabled = false }
 tasks.named("prepareJarSearchableOptions") { enabled = false }
+tasks.named("publishPlugin") { enabled = false }
 
 kotlin {
     jvmToolchain(rootProject.properties["jvmToolchainVersion"].toString().toInt())

diff --git a/src/main/kotlin/org/jetbrains/research/testspark/appstarter/ProjectApplicationUtils.kt b/src/main/kotlin/org/jetbrains/research/testspark/appstarter/ProjectApplicationUtils.kt
@@ -13,8 +13,6 @@ import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.application.ex.ApplicationManagerEx
 import com.intellij.openapi.progress.util.ProgressIndicatorBase
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.project.ex.ProjectManagerEx
-import com.intellij.openapi.startup.StartupManager
 import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.vfs.LocalFileSystem
@@ -27,7 +25,6 @@ import org.jetbrains.plugins.gradle.GradleCommandLineProjectConfigurator
 import org.slf4j.LoggerFactory
 import java.nio.file.Path
 import java.util.function.Predicate
-import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
 class ProjectConfiguratorException : Exception {
@@ -162,15 +159,16 @@ object ProjectApplicationUtils {
     private fun closeProject(project: Project) {
         logger.info("Closing project $project...")
         ApplicationManager.getApplication().assertIsNonDispatchThread()
-
-        ApplicationManager.getApplication().invokeAndWait {
-            ProjectManagerEx.getInstanceEx().forceCloseProject(project)
-        }
+        // ToDo: move headless mode to another branch
+//        ApplicationManager.getApplication().invokeAndWait {
+//            ProjectManagerEx.getInstanceEx().forceCloseProject(project)
+//        }
     }
 
     private suspend fun waitAllStartupActivitiesPassed(project: Project): Unit = suspendCoroutine {
         logger.info("Waiting all startup activities passed $project...")
-        StartupManager.getInstance(project).runAfterOpened { it.resume(Unit) }
+        // ToDo: move headless mode to another branch
+//        StartupManager.getInstance(project).runAfterOpened { it.resume(Unit) }
         waitForInvokeLaterActivities()
     }