From 25abe925f630a0f87ed6bc6b8dd7b528c1a33705 Mon Sep 17 00:00:00 2001 From: Maksim Kurnikov Date: Thu, 16 Jan 2025 16:22:27 +0100 Subject: [PATCH] 2025.1 EAP support (#270) * add 251 support * fix verifier errors --- .github/workflows/check.yml | 3 +++ .../workflows/publish-stable-on-release.yml | 20 ++----------------- gradle-251.properties | 5 +++++ .../cli/sentryReporter/SentryErrorReporter.kt | 8 ++------ .../move/ide/actions/CreateMoveFileAction.kt | 1 + src/main/kotlin/org/move/stdext/Utils.kt | 3 --- 6 files changed, 13 insertions(+), 27 deletions(-) create mode 100644 gradle-251.properties diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 08c0f554e..a247cfb98 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -12,6 +12,9 @@ jobs: matrix: gradle-properties-version: [ 242, 243 ] platform-type: [ RR, PC ] + include: + - gradle-properties-version: 251 + platform-type: IC runs-on: ubuntu-latest env: diff --git a/.github/workflows/publish-stable-on-release.yml b/.github/workflows/publish-stable-on-release.yml index 8ec4fb5c4..3041f43cb 100644 --- a/.github/workflows/publish-stable-on-release.yml +++ b/.github/workflows/publish-stable-on-release.yml @@ -5,26 +5,10 @@ on: types: [released] jobs: -# check-for-tests-success: -# runs-on: ubuntu-latest -# permissions: -# actions: write -# -# steps: -# - name: Early exit if tests wasn't successful -# if: ${{ github.event.workflow_run.conclusion != 'success' }} -# run: | -# gh run cancel ${{ github.run_id }} -# gh run watch ${{ github.run_id }} -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - publish-eap-channel: -# needs: [ check-for-tests-success ] + publish-release: strategy: matrix: - gradle-properties-version: [ 242, 243 ] + gradle-properties-version: [ 242, 243, 251 ] runs-on: ubuntu-latest env: diff --git a/gradle-251.properties b/gradle-251.properties new file mode 100644 index 000000000..57e015514 --- /dev/null +++ b/gradle-251.properties @@ -0,0 +1,5 @@ +# IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties +platformType = IC +platformVersion = 251.14649.49 + +stableRelease=true diff --git a/src/main/kotlin/org/move/cli/sentryReporter/SentryErrorReporter.kt b/src/main/kotlin/org/move/cli/sentryReporter/SentryErrorReporter.kt index e21ba80f7..15e51e1fb 100644 --- a/src/main/kotlin/org/move/cli/sentryReporter/SentryErrorReporter.kt +++ b/src/main/kotlin/org/move/cli/sentryReporter/SentryErrorReporter.kt @@ -1,7 +1,5 @@ package org.move.cli.sentryReporter -import com.intellij.diagnostic.DiagnosticBundle -import com.intellij.diagnostic.IdeErrorsDialog import com.intellij.notification.NotificationGroupManager import com.intellij.notification.NotificationType import com.intellij.openapi.application.ApplicationInfo @@ -72,7 +70,7 @@ class SentryErrorReporter: ErrorReportSubmitter() { val sentryEvent = SentryEvent() sentryEvent.level = SentryLevel.ERROR - val plugin = IdeErrorsDialog.getPlugin(event) + val plugin = this.pluginDescriptor val pluginInfoContext = mutableMapOf() pluginInfoContext["Platform"] = ApplicationInfo.getInstance().fullApplicationName @@ -120,10 +118,8 @@ private fun onSuccess(project: Project?, callback: Consumer