From 87b4bc14d82ffba8db709ba25f0c4039c356cace Mon Sep 17 00:00:00 2001 From: Richardas Kuchinskas Date: Sun, 2 Mar 2025 23:24:46 +0300 Subject: [PATCH 01/10] prototype --- gradle.properties | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 40e021d6..7c94c951 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ pluginGroup = com.vk pluginName = admstorm pluginRepositoryUrl = https://github.com/VKCOM/admstorm # SemVer format -> https://semver.org -pluginVersion = 2.0.6 +pluginVersion = 2.0.7 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html pluginSinceBuild = 242 @@ -12,19 +12,19 @@ pluginUntilBuild = 242.* # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType = IU -platformVersion = 2024.2 +platformVersion = 2024.3.1 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP # PHP Plugin - https://plugins.jetbrains.com/plugin/6610-php/versions # Terminal Plugin - https://plugins.jetbrains.com/plugin/13123-terminal/versions -platformPlugins = com.jetbrains.php:242.20224.427, org.jetbrains.plugins.terminal:242.20224.237 +platformPlugins = com.jetbrains.php:243.22562.233, org.jetbrains.plugins.terminal:243.22562.115 # Example: platformBundledPlugins = com.intellij.java platformBundledPlugins = com.intellij.java, Git4Idea, org.jetbrains.plugins.remote-run # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 8.9 +gradleVersion = 8.10.2 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib kotlin.stdlib.default.dependency = false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0e..df97d72b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle.kts b/settings.gradle.kts index 3045cbf6..6ff7038a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,5 @@ +rootProject.name = "admstorm" + plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } - -rootProject.name = "admstorm" From 2fecfec63e4c0a70acd07ec529126fa1894a4eda Mon Sep 17 00:00:00 2001 From: Richardas Kuchinskas Date: Mon, 3 Mar 2025 00:01:16 +0300 Subject: [PATCH 02/10] fixed getCommitAndPushActionName --- .../git/commit/GitCommitAndPushToAdmExecutorAction.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/com/vk/admstorm/actions/git/commit/GitCommitAndPushToAdmExecutorAction.kt b/src/main/kotlin/com/vk/admstorm/actions/git/commit/GitCommitAndPushToAdmExecutorAction.kt index 936a2c8e..9dad1742 100644 --- a/src/main/kotlin/com/vk/admstorm/actions/git/commit/GitCommitAndPushToAdmExecutorAction.kt +++ b/src/main/kotlin/com/vk/admstorm/actions/git/commit/GitCommitAndPushToAdmExecutorAction.kt @@ -9,6 +9,7 @@ import com.intellij.openapi.vcs.changes.CommitContext import com.intellij.openapi.vcs.changes.CommitSession import com.intellij.openapi.vcs.changes.LocalCommitExecutor import com.intellij.openapi.vcs.changes.actions.BaseCommitExecutorAction +import com.intellij.vcs.commit.CommitWorkflowHandlerState import com.intellij.vcs.commit.commitProperty import com.vk.admstorm.utils.ServerNameProvider import com.vk.admstorm.utils.extensions.pluginEnabled @@ -42,7 +43,10 @@ class GitCommitAndPushToAdmExecutorAction : BaseCommitExecutorAction() { override fun update(e: AnActionEvent) { val workflowHandler = e.getData(VcsDataKeys.COMMIT_WORKFLOW_HANDLER) if (workflowHandler != null) { - val templateText = workflowHandler.getCommitAndPushActionName() + val state = CommitWorkflowHandlerState( + isAmend = workflowHandler.amendCommitHandler.isAmendCommitMode, isSkipCommitChecks = false + ) + val templateText = getCommitAndPushActionName(state) e.presentation.text = templateText.removeSuffix("…") + " → ${ServerNameProvider.name()} → Gitlab…" From 203d4c5768d9bbacaa15a0a3a4198e5dd4fa07ff Mon Sep 17 00:00:00 2001 From: Richardas Kuchinskas Date: Mon, 3 Mar 2025 00:02:19 +0300 Subject: [PATCH 03/10] todo --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a4fec0b1..634ee6e7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ detektFormatting = "1.23.1" # plugins kotlin = "1.9.25" changelog = "2.2.1" -intelliJPlatform = "2.0.1" +intelliJPlatform = "2.0.1" # TODO: update this in next update: https://youtrack.jetbrains.com/issue/MP-7019# kotlinSerialization = "2.0.20" gradleDiktatPlugin = "1.2.5" gradleDetektPlugin = "1.23.7" From dcbe712d4977a16d144b3ebebc2ad68eb01af075 Mon Sep 17 00:00:00 2001 From: Richardas Kuchinskas Date: Mon, 3 Mar 2025 00:06:16 +0300 Subject: [PATCH 04/10] github actions --- .github/workflows/build.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7bae6bd5..721db428 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,6 +24,9 @@ jobs: # Check out the current repository - name: Fetch Sources uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit + fetch-depth: 0 # a full history is required for pull request analysis # Validate wrapper - name: Gradle Wrapper Validation @@ -38,9 +41,7 @@ jobs: # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - with: - gradle-home-cache-cleanup: true + uses: gradle/actions/setup-gradle@v4 # Set environment variables - name: Export Properties @@ -72,6 +73,9 @@ jobs: # Check out the current repository - name: Fetch Sources uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit + fetch-depth: 0 # a full history is required for pull request analysis # Set up Java environment for the next steps - name: Setup Java @@ -82,9 +86,7 @@ jobs: # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - with: - gradle-home-cache-cleanup: true + uses: gradle/actions/setup-gradle@v4 # Run Verify Plugin task and IntelliJ Plugin Verifier tool - name: Run Plugin Verification tasks From f52666560c7632cc005ad46acced97cce4d1c3ae Mon Sep 17 00:00:00 2001 From: Richardas Kuchinskas Date: Mon, 3 Mar 2025 12:52:45 +0300 Subject: [PATCH 05/10] xml fix --- .run/Run Plugin.run.xml | 45 +++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/.run/Run Plugin.run.xml b/.run/Run Plugin.run.xml index d15ff681..37489f11 100644 --- a/.run/Run Plugin.run.xml +++ b/.run/Run Plugin.run.xml @@ -1,24 +1,25 @@ - - - - - - - true - true - false - - + + + + + + + true + true + false + false + + \ No newline at end of file From 6052fc58b85df2ec06846e7b97aca4532cee089d Mon Sep 17 00:00:00 2001 From: Richardas Kuchinskas Date: Mon, 3 Mar 2025 13:15:24 +0300 Subject: [PATCH 06/10] version build up --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7c94c951..6d5ff6b5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,8 +7,8 @@ pluginRepositoryUrl = https://github.com/VKCOM/admstorm pluginVersion = 2.0.7 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html -pluginSinceBuild = 242 -pluginUntilBuild = 242.* +pluginSinceBuild = 243 +pluginUntilBuild = 243.* # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType = IU From a942e98c3f6b40a34f6fe67b0666351ed86ae329 Mon Sep 17 00:00:00 2001 From: Richardas Kuchinskas Date: Mon, 3 Mar 2025 13:39:09 +0300 Subject: [PATCH 07/10] changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfb6a288..2b0aef0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## [Unreleased] +## [1.2.14] - 01.03.2024 + +- Adapt code for 2024.3 + ## 2.0.6 - 16.09.2024 - Adapt code for PhpStorm 2024.2 From 7ff2428a5a385038500ce589ca4a4c6227a82abc Mon Sep 17 00:00:00 2001 From: Richardas Kuchinskas Date: Mon, 3 Mar 2025 17:26:07 +0300 Subject: [PATCH 08/10] textFieldWithBrowseButton fix and version --- gradle.properties | 2 +- .../phpunit/RemotePhpUnitConfigurationEditor.kt | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6d5ff6b5..4fa1d57d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ pluginUntilBuild = 243.* # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType = IU -platformVersion = 2024.3.1 +platformVersion = 2024.3 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP diff --git a/src/main/kotlin/com/vk/admstorm/configuration/phpunit/RemotePhpUnitConfigurationEditor.kt b/src/main/kotlin/com/vk/admstorm/configuration/phpunit/RemotePhpUnitConfigurationEditor.kt index 0fb23018..5fc0b21f 100644 --- a/src/main/kotlin/com/vk/admstorm/configuration/phpunit/RemotePhpUnitConfigurationEditor.kt +++ b/src/main/kotlin/com/vk/admstorm/configuration/phpunit/RemotePhpUnitConfigurationEditor.kt @@ -90,9 +90,9 @@ open class RemotePhpUnitConfigurationEditor(val project: Project) : row("Directory:") { textFieldWithBrowseButton( - "Select PHPUnit Tests Folder", + FileChooserDescriptorFactory.createSingleFolderDescriptor().withTitle("Select PHPUnit Tests Folder"), project, - FileChooserDescriptorFactory.createSingleFolderDescriptor() + null ) .align(AlignX.FILL) .bindText(model::directory) @@ -124,25 +124,25 @@ open class RemotePhpUnitConfigurationEditor(val project: Project) : group("Command Line") { row("PHPUnit Executable:") { textFieldWithBrowseButton( - "Select PHPUnit Executable", + FileChooserDescriptorFactory.createSingleFolderDescriptor().withTitle("Select PHPUnit Executable"), project, - FileChooserDescriptorFactory.createSingleFileDescriptor() + null ) .align(AlignX.FILL) .bindText(model::phpUnitExe) } row("Configuration file:") { textFieldWithBrowseButton( - "Select PHPUnit Configuration File", - project, FileChooserDescriptorFactory.createSingleFileDescriptor(XmlFileType.INSTANCE) + .withTitle("Select PHPUnit Configuration File"), + project, + null ) .align(AlignX.FILL) .bindText(model::phpUnitConfig) } }.topGap(TopGap.NONE) } - classTextField.addDocumentListener(object : DocumentListener { override fun documentChanged(event: DocumentEvent) { mainPanel.reset() From f47f2ec91f6969e4bb5b183514e17facd788ad63 Mon Sep 17 00:00:00 2001 From: Richardas Kuchinskas Date: Mon, 3 Mar 2025 17:31:27 +0300 Subject: [PATCH 09/10] dependencies update --- .github/workflows/build.yml | 6 ------ build.gradle.kts | 4 ---- gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.jar | Bin 43504 -> 43583 bytes 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 721db428..07de31f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,9 +24,6 @@ jobs: # Check out the current repository - name: Fetch Sources uses: actions/checkout@v4 - with: - ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit - fetch-depth: 0 # a full history is required for pull request analysis # Validate wrapper - name: Gradle Wrapper Validation @@ -73,9 +70,6 @@ jobs: # Check out the current repository - name: Fetch Sources uses: actions/checkout@v4 - with: - ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit - fetch-depth: 0 # a full history is required for pull request analysis # Set up Java environment for the next steps - name: Setup Java diff --git a/build.gradle.kts b/build.gradle.kts index 85c11890..33f26166 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -115,10 +115,6 @@ tasks { gradleVersion = providers.gradleProperty("gradleVersion").get() } - publishPlugin { - dependsOn(patchChangelog) - } - detekt.configure { reports { html.required.set(true) diff --git a/gradle.properties b/gradle.properties index 4fa1d57d..42456164 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,10 +18,10 @@ platformVersion = 2024.3 # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP # PHP Plugin - https://plugins.jetbrains.com/plugin/6610-php/versions # Terminal Plugin - https://plugins.jetbrains.com/plugin/13123-terminal/versions -platformPlugins = com.jetbrains.php:243.22562.233, org.jetbrains.plugins.terminal:243.22562.115 +platformPlugins = com.jetbrains.php:243.21565.211 # Example: platformBundledPlugins = com.intellij.java -platformBundledPlugins = com.intellij.java, Git4Idea, org.jetbrains.plugins.remote-run +platformBundledPlugins = com.intellij.java, Git4Idea, org.jetbrains.plugins.remote-run, org.jetbrains.plugins.terminal # Gradle Releases -> https://github.com/gradle/gradle/releases gradleVersion = 8.10.2 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c3521197d7c4586c843d1d3e9090525f1898cde..a4b76b9530d66f5e68d973ea569d8e19de379189 100644 GIT binary patch delta 3990 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 From 6f287ff0bf2340a48f74b8c845afa78f9b9820e3 Mon Sep 17 00:00:00 2001 From: Danil Ovchinnikov Date: Mon, 3 Mar 2025 19:18:54 +0300 Subject: [PATCH 10/10] revision fixes and other changes --- .github/dependabot.yml | 22 +++++++++++++++++++ .run/Run Plugin.run.xml | 46 +++++++++++++++++++-------------------- CHANGELOG.md | 4 ++-- build.gradle.kts | 5 ++++- gradle.properties | 2 +- gradle/libs.versions.toml | 6 ++--- ignored-problems.txt | 2 +- settings.gradle.kts | 4 ++-- 8 files changed, 58 insertions(+), 33 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..5d626778 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,22 @@ +version: 2 +updates: + - package-ecosystem: "gradle" + directory: "/" + schedule: + interval: "daily" + allow: + - dependency-type: "direct" + reviewers: + - "VKCOM/vk-sec" + - "VKCOM/kphp-developers" + open-pull-requests-limit: 0 + - package-ecosystem: "github-actions" + # Workflow files stored in the + # default location of `.github/workflows` + directory: "/" + schedule: + interval: "daily" + reviewers: + - "VKCOM/vk-sec" + - "VKCOM/kphp-developers" + open-pull-requests-limit: 0 diff --git a/.run/Run Plugin.run.xml b/.run/Run Plugin.run.xml index 37489f11..c4ec3d67 100644 --- a/.run/Run Plugin.run.xml +++ b/.run/Run Plugin.run.xml @@ -1,25 +1,25 @@ - - - - - - - true - true - false - false - - + + + + + + + true + true + false + false + + \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b0aef0f..217e067a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,9 @@ ## [Unreleased] -## [1.2.14] - 01.03.2024 +## 2.0.7 - 01.03.2024 -- Adapt code for 2024.3 +- Adapt code for PhpStorm 2024.3 ## 2.0.6 - 16.09.2024 diff --git a/build.gradle.kts b/build.gradle.kts index 33f26166..e820b77b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,6 @@ import org.apache.tools.ant.filters.ReplaceTokens import org.jetbrains.changelog.Changelog +import org.jetbrains.intellij.platform.gradle.TestFrameworkType plugins { id("java") // Java support @@ -23,6 +24,7 @@ kotlin { repositories { mavenCentral() gradlePluginPortal() + // IntelliJ Platform Gradle Plugin Repositories Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-repositories-extension.html intellijPlatform { defaultRepositories() @@ -34,8 +36,8 @@ dependencies { detektPlugins(libs.detektFormatting) implementation(libs.kotlinxSerializationJson) - implementation(libs.markdown) implementation(libs.sentry) + testImplementation(libs.junit) // IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html intellijPlatform { @@ -50,6 +52,7 @@ dependencies { instrumentationTools() pluginVerifier() zipSigner() + testFramework(TestFrameworkType.Platform) } } diff --git a/gradle.properties b/gradle.properties index 42456164..d0b8ea55 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ platformVersion = 2024.3 platformPlugins = com.jetbrains.php:243.21565.211 # Example: platformBundledPlugins = com.intellij.java -platformBundledPlugins = com.intellij.java, Git4Idea, org.jetbrains.plugins.remote-run, org.jetbrains.plugins.terminal +platformBundledPlugins = com.intellij.java, org.intellij.plugins.markdown, Git4Idea, org.jetbrains.plugins.remote-run, org.jetbrains.plugins.terminal # Gradle Releases -> https://github.com/gradle/gradle/releases gradleVersion = 8.10.2 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 634ee6e7..892cdf0b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] # libraries -markdown = "0.2.4" +junit = "4.13.2" sentry = "6.1.0" kotlinxSerializationJson = "1.7.3" detektFormatting = "1.23.1" @@ -8,13 +8,13 @@ detektFormatting = "1.23.1" # plugins kotlin = "1.9.25" changelog = "2.2.1" -intelliJPlatform = "2.0.1" # TODO: update this in next update: https://youtrack.jetbrains.com/issue/MP-7019# +intelliJPlatform = "2.0.1" # TODO: update this in next update: https://youtrack.jetbrains.com/issue/MP-7019 kotlinSerialization = "2.0.20" gradleDiktatPlugin = "1.2.5" gradleDetektPlugin = "1.23.7" [libraries] -markdown = { group = "org.jetbrains", name = "markdown", version.ref = "markdown" } +junit = { group = "junit", name = "junit", version.ref = "junit" } sentry = { group = "io.sentry", name = "sentry", version.ref = "sentry" } kotlinxSerializationJson = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" } detektFormatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detektFormatting" } diff --git a/ignored-problems.txt b/ignored-problems.txt index fe80e32d..ddabe5b8 100644 --- a/ignored-problems.txt +++ b/ignored-problems.txt @@ -1 +1 @@ -com.vk.admstorm:2.0.6:Illegal access to package-private class com.intellij.dvcs.push.ui.CustomRenderedTreeNode \ No newline at end of file +com.vk.admstorm:2.0.7:Illegal access to package-private class com.intellij.dvcs.push.ui.CustomRenderedTreeNode diff --git a/settings.gradle.kts b/settings.gradle.kts index 6ff7038a..3045cbf6 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,5 @@ -rootProject.name = "admstorm" - plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } + +rootProject.name = "admstorm"