diff --git a/.github/workflows/jetbrains-update-plugin-platform-template.yml b/.github/workflows/jetbrains-update-plugin-platform-template.yml index 2f58659df528ee..653b66a040bd3f 100644 --- a/.github/workflows/jetbrains-update-plugin-platform-template.yml +++ b/.github/workflows/jetbrains-update-plugin-platform-template.yml @@ -90,7 +90,7 @@ jobs: - [x] /werft with-large-vm - [x] /werft with-gce-vm - [x] with-integration-tests=jetbrains - - [x] latest-ide-version=${{ contains(inputs.pluginId, 'latest') }} + - [x] latest-ide-version=${{ contains(inputs.pluginId, 'true') }} _This PR was created automatically with GitHub Actions using [this](https://github.com/gitpod-io/gitpod/blob/main/.github/workflows/jetbrains-update-plugin-platform-template.yml) template._ commit-message: "Update Platform Version of ${{ inputs.pluginName }} to ${{ steps.latest-version.outputs.result }}" @@ -134,7 +134,7 @@ jobs: - [x] /werft with-large-vm - [x] /werft with-gce-vm - [x] with-integration-tests=jetbrains - - [x] latest-ide-version=${{ contains(inputs.pluginId, 'latest') }} + - [x] latest-ide-version=${{ contains(inputs.pluginId, 'true') }} _This PR was created automatically with GitHub Actions using [this](https://github.com/gitpod-io/gitpod/blob/main/.github/workflows/jetbrains-update-plugin-platform-template.yml) template._ commit-message: "Update Platform Version of ${{ inputs.pluginName }} to ${{ steps.latest-version.outputs.result }}" diff --git a/components/ide/jetbrains/backend-plugin/gradle-latest.properties b/components/ide/jetbrains/backend-plugin/gradle-latest.properties index 64feec2edf3b0f..32266d1d100e07 100644 --- a/components/ide/jetbrains/backend-plugin/gradle-latest.properties +++ b/components/ide/jetbrains/backend-plugin/gradle-latest.properties @@ -2,10 +2,10 @@ # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html # for insight into build numbers and IntelliJ Platform versions. # revert pluginSinceBuild if it's unnecessary -pluginSinceBuild=243.15521 -pluginUntilBuild=243.* +pluginSinceBuild=251.17181 +pluginUntilBuild=251.* # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl # See https://jb.gg/intellij-platform-builds-list for available build versions. -pluginVerifierIdeVersions=2024.3 -# Version from "com.jetbrains.intellij.idea" which can be found at https://www.jetbrains.com/intellij-repository/snapshots -platformVersion=243.15521.24 +pluginVerifierIdeVersions=2025.1 +# Version from "com.jetbrains.intellij.idea" which can be found at https://www.jetbrains.com/updates/updates.xml or exec `./gradlew printProductsReleases` +platformVersion=251.17181.16 diff --git a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodClientProjectSessionTracker.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodClientProjectSessionTracker.kt index a676e01faa8028..7a5c3cb927a332 100644 --- a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodClientProjectSessionTracker.kt +++ b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodClientProjectSessionTracker.kt @@ -9,7 +9,7 @@ import com.intellij.ide.BrowserUtil import com.intellij.notification.NotificationAction import com.intellij.notification.NotificationType import com.intellij.openapi.Disposable -import com.intellij.openapi.client.ClientSessionsManager +import com.intellij.openapi.client.ClientProjectSession import com.intellij.openapi.components.service import com.intellij.openapi.components.serviceOrNull import com.intellij.openapi.diagnostic.thisLogger @@ -35,10 +35,10 @@ import java.util.concurrent.CancellationException import java.util.concurrent.CompletableFuture @Suppress("UnstableApiUsage", "OPT_IN_USAGE") -class GitpodClientProjectSessionTracker(private val project: Project) : Disposable { +abstract class AbstractGitpodClientProjectSessionTracker(private val project: Project) : Disposable { private val manager = service() - private val session = ClientSessionsManager.getProjectSession(project) + abstract val session: ClientProjectSession? private lateinit var info: Info.WorkspaceInfoResponse private val lifetime = Lifetime.Eternal.createNested() @@ -226,7 +226,7 @@ class GitpodClientProjectSessionTracker(private val project: Project) : Disposab private fun trackEvent(eventName: String, props: Map) { if (session == null) return manager.trackEvent(eventName, mapOf( - "sessionId" to session.clientId.value + "sessionId" to session?.clientId?.value ).plus(props)) } } diff --git a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/GitpodClientProjectSessionTracker.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/GitpodClientProjectSessionTracker.kt new file mode 100644 index 00000000000000..fffdc4b2005dcf --- /dev/null +++ b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/GitpodClientProjectSessionTracker.kt @@ -0,0 +1,16 @@ +// Copyright (c) 2025 Gitpod GmbH. All rights reserved. +// Licensed under the GNU Affero General Public License (AGPL). +// See License.AGPL.txt in the project root for license information. + +package io.gitpod.jetbrains.remote.latest + +import com.intellij.codeWithMe.ClientId +import com.intellij.openapi.client.ClientProjectSession +import com.intellij.openapi.client.ClientSessionsManager +import com.intellij.openapi.project.Project +import io.gitpod.jetbrains.remote.AbstractGitpodClientProjectSessionTracker + +@Suppress("UnstableApiUsage") +class GitpodClientProjectSessionTracker(val project: Project) : AbstractGitpodClientProjectSessionTracker(project) { + override val session: ClientProjectSession? = ClientSessionsManager.getProjectSession(project, ClientId.current) +} diff --git a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/GitpodClientProjectSessionTracker.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/GitpodClientProjectSessionTracker.kt new file mode 100644 index 00000000000000..914692daf7ea63 --- /dev/null +++ b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/GitpodClientProjectSessionTracker.kt @@ -0,0 +1,15 @@ +// Copyright (c) 2025 Gitpod GmbH. All rights reserved. +// Licensed under the GNU Affero General Public License (AGPL). +// See License.AGPL.txt in the project root for license information. + +package io.gitpod.jetbrains.remote.stable + +import com.intellij.openapi.client.ClientProjectSession +import com.intellij.openapi.client.ClientSessionsManager +import com.intellij.openapi.project.Project +import io.gitpod.jetbrains.remote.AbstractGitpodClientProjectSessionTracker + +@Suppress("UnstableApiUsage") +class GitpodClientProjectSessionTracker(val project: Project) : AbstractGitpodClientProjectSessionTracker(project) { + override val session: ClientProjectSession? = ClientSessionsManager.getProjectSession(project) +} diff --git a/components/ide/jetbrains/backend-plugin/src/main/resources-latest/META-INF/extensions.xml b/components/ide/jetbrains/backend-plugin/src/main/resources-latest/META-INF/extensions.xml index 9d4b9661deb26b..4b6d818e497606 100644 --- a/components/ide/jetbrains/backend-plugin/src/main/resources-latest/META-INF/extensions.xml +++ b/components/ide/jetbrains/backend-plugin/src/main/resources-latest/META-INF/extensions.xml @@ -6,5 +6,7 @@ + diff --git a/components/ide/jetbrains/backend-plugin/src/main/resources-stable/META-INF/extensions.xml b/components/ide/jetbrains/backend-plugin/src/main/resources-stable/META-INF/extensions.xml index 9d4b9661deb26b..87bf33c733e899 100644 --- a/components/ide/jetbrains/backend-plugin/src/main/resources-stable/META-INF/extensions.xml +++ b/components/ide/jetbrains/backend-plugin/src/main/resources-stable/META-INF/extensions.xml @@ -6,5 +6,7 @@ + diff --git a/components/ide/jetbrains/backend-plugin/src/main/resources/META-INF/plugin.xml b/components/ide/jetbrains/backend-plugin/src/main/resources/META-INF/plugin.xml index a8d1d6e7bdeadb..7505ec6207d3ea 100644 --- a/components/ide/jetbrains/backend-plugin/src/main/resources/META-INF/plugin.xml +++ b/components/ide/jetbrains/backend-plugin/src/main/resources/META-INF/plugin.xml @@ -38,9 +38,6 @@ - -