Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve marketplace issues #397

Merged
merged 5 commits into from
Oct 16, 2024
Merged

Resolve marketplace issues #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c7d59a
Disable publishPlugin tasks in sub-modules' build configurations
pderakhshanfar Oct 16, 2024
ed7fcf9
Exclude plugin.xml from JarTask of hasGrazie feature
pderakhshanfar Oct 16, 2024
8d5ecc5
Remove internal usage APIs
pderakhshanfar Oct 16, 2024
f49b053
Refactor: add TODO comments for headless mode adjustment
pderakhshanfar Oct 16, 2024
4bcc7e0
Update since build
pderakhshanfar Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this mean that we lose the audience that has not yet transitioned to newer IntelliJ version?

@pderakhshanfar

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No they can still use the older version but they cannot update the plugin if they don't update IDEA

pluginUntilBuild = 242.*

# IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
Expand Down
1 change: 1 addition & 0 deletions java/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
1 change: 1 addition & 0 deletions kotlin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions langwrappers/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
14 changes: 6 additions & 8 deletions src/main/kotlin/org/jetbrains/research/testspark/appstarter/ProjectApplicationUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 {
Expand Down Expand Up @@ -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()
}

Expand Down
Loading