From 5c7d59a61f242efe4df2b5e79336544aa7724763 Mon Sep 17 00:00:00 2001 From: "Pouria.Derakhshanfar" Date: Wed, 16 Oct 2024 18:22:48 +0200 Subject: [PATCH 1/5] Disable publishPlugin tasks in sub-modules' build configurations --- java/build.gradle.kts | 1 + kotlin/build.gradle.kts | 1 + langwrappers/build.gradle.kts | 1 + 3 files changed, 3 insertions(+) diff --git a/java/build.gradle.kts b/java/build.gradle.kts index f90007a00..57e63b50d 100644 --- 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 index 8cd1fa6f8..2faafc052 100644 --- 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 index 336bca55d..16c6cebd1 100644 --- 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()) From ed7fcf9a1f74c1d077d7e8bdcb191083056aaf85 Mon Sep 17 00:00:00 2001 From: "Pouria.Derakhshanfar" Date: Wed, 16 Oct 2024 18:23:52 +0200 Subject: [PATCH 2/5] Exclude plugin.xml from JarTask of hasGrazie feature --- build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 717f160f0..c09e328e3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -93,6 +93,10 @@ if (spaceCredentialsProvided()) { dependsOn("checkCredentials") } + tasks.named(hasGrazieAccess.jarTaskName) { + exclude("**/plugin.xml") + } + // add build of new source set as the part of UI testing tasks.prepareTestSandbox.configure { dependsOn(hasGrazieAccess.jarTaskName) From 8d5ecc55ff3a4b4930aa4080efe543b03556e4cf Mon Sep 17 00:00:00 2001 From: "Pouria.Derakhshanfar" Date: Wed, 16 Oct 2024 18:24:12 +0200 Subject: [PATCH 3/5] Remove internal usage APIs --- .../testspark/appstarter/ProjectApplicationUtils.kt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/org/jetbrains/research/testspark/appstarter/ProjectApplicationUtils.kt b/src/main/kotlin/org/jetbrains/research/testspark/appstarter/ProjectApplicationUtils.kt index 50e535442..1d78b9cc0 100644 --- 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 { @@ -163,14 +160,14 @@ object ProjectApplicationUtils { logger.info("Closing project $project...") ApplicationManager.getApplication().assertIsNonDispatchThread() - ApplicationManager.getApplication().invokeAndWait { - ProjectManagerEx.getInstanceEx().forceCloseProject(project) - } +// 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) } +// StartupManager.getInstance(project).runAfterOpened { it.resume(Unit) } waitForInvokeLaterActivities() } From f49b0538c961506d09a50d840f235db399f9a131 Mon Sep 17 00:00:00 2001 From: "Pouria.Derakhshanfar" Date: Wed, 16 Oct 2024 18:29:37 +0200 Subject: [PATCH 4/5] Refactor: add TODO comments for headless mode adjustment --- .../research/testspark/appstarter/ProjectApplicationUtils.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/org/jetbrains/research/testspark/appstarter/ProjectApplicationUtils.kt b/src/main/kotlin/org/jetbrains/research/testspark/appstarter/ProjectApplicationUtils.kt index 1d78b9cc0..4fd7a12fa 100644 --- a/src/main/kotlin/org/jetbrains/research/testspark/appstarter/ProjectApplicationUtils.kt +++ b/src/main/kotlin/org/jetbrains/research/testspark/appstarter/ProjectApplicationUtils.kt @@ -159,7 +159,7 @@ object ProjectApplicationUtils { private fun closeProject(project: Project) { logger.info("Closing project $project...") ApplicationManager.getApplication().assertIsNonDispatchThread() - + // ToDo: move headless mode to another branch // ApplicationManager.getApplication().invokeAndWait { // ProjectManagerEx.getInstanceEx().forceCloseProject(project) // } @@ -167,6 +167,7 @@ object ProjectApplicationUtils { private suspend fun waitAllStartupActivitiesPassed(project: Project): Unit = suspendCoroutine { logger.info("Waiting all startup activities passed $project...") + // ToDo: move headless mode to another branch // StartupManager.getInstance(project).runAfterOpened { it.resume(Unit) } waitForInvokeLaterActivities() } From 4bcc7e0703852dc99309e4b0fb9ab893688d43e0 Mon Sep 17 00:00:00 2001 From: "Pouria.Derakhshanfar" Date: Wed, 16 Oct 2024 18:52:48 +0200 Subject: [PATCH 5/5] Update since build --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2297e18bd..5fa69f82d 100644 --- 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