From 088bfd97d3c2817b4aa5b2696283006d9091e5bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= <bgabor8@bloomberg.net>
Date: Mon, 12 Aug 2024 09:07:41 -0700
Subject: [PATCH] Extend compatibility for PyCharm Professional
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Bernát Gábor <bgabor8@bloomberg.net>
---
 CHANGELOG.md                           |  2 ++
 build.gradle.kts                       | 21 +++++++++++++--------
 gradle.properties                      |  3 ---
 src/main/resources/META-INF/plugin.xml |  2 +-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf60be3..6f65da7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+- Extend compatibility for PyCharm Professional
+
 ## [2.0.0] - 2024-08-12
 
 ### Changed
diff --git a/build.gradle.kts b/build.gradle.kts
index 381b3fd..7eb34a7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
-
 import org.jetbrains.changelog.Changelog
 import org.jetbrains.changelog.markdownToHTML
 import org.jetbrains.intellij.platform.gradle.Constants.Constraints
+import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 
 plugins {
@@ -10,7 +10,7 @@ plugins {
     alias(libs.plugins.kotlin)
     alias(libs.plugins.kover)
     alias(libs.plugins.ktlint)
-//    alias(libs.plugins.taskinfo) // cache incompatible https://gitlab.com/barfuin/gradle-taskinfo/-/issues/23
+//    alias(libs.plugins.taskinfo) // cache incompatible - https://gitlab.com/barfuin/gradle-taskinfo/-/issues/23
     alias(libs.plugins.testLogger)
     alias(libs.plugins.versionPlugin)
     alias(libs.plugins.versionUpdate)
@@ -18,7 +18,7 @@ plugins {
 
 group = providers.gradleProperty("pluginGroup").get()
 version = providers.gradleProperty("pluginVersion").get()
-
+val platformVersion = providers.gradleProperty("platformVersion").get()
 kotlin {
     jvmToolchain(17)
 }
@@ -36,10 +36,9 @@ dependencies {
     testRuntimeOnly("junit:junit:4.13.2") // https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1711
     testImplementation(libs.remoteRobot)
     testImplementation(libs.remoteRobotFixtures)
-
     intellijPlatform {
-        create(providers.gradleProperty("platformType"), providers.gradleProperty("platformVersion"))
-        plugins(providers.gradleProperty("platformPlugins").map { it.split(',') })
+        pycharmCommunity(platformVersion)
+        bundledPlugin("PythonCore")
         instrumentationTools()
         pluginVerifier()
         zipSigner()
@@ -99,10 +98,16 @@ intellijPlatform {
                 )
             }
     }
-
     pluginVerification {
         ides {
-            recommended()
+            // target supporting the following platforms
+            ide(IntelliJPlatformType.PyCharmCommunity, platformVersion)
+            ide(IntelliJPlatformType.PyCharmProfessional, platformVersion)
+            ide(IntelliJPlatformType.IntellijIdeaCommunity, platformVersion)
+            ide(IntelliJPlatformType.IntellijIdeaUltimate, platformVersion)
+            ide(IntelliJPlatformType.GoLand, platformVersion)
+            ide(IntelliJPlatformType.CLion, platformVersion)
+            ide(IntelliJPlatformType.RustRover, platformVersion)
         }
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 08c561e..37f952d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,9 +4,6 @@ nl.littlerobots.vcu.resolver=true
 org.gradle.caching=true
 org.gradle.configuration-cache=true
 org.gradle.welcome=never
-# https://plugins.jetbrains.com/plugin/7322-python-community-edition/versions/stable pick compatible with IC
-platformPlugins=PythonCore:241.14494.240
-platformType=IC
 platformVersion=2024.1
 pluginGroup=com.github.pyvenvmanage
 pluginName=PyVenv Manage 2
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 0c06e9c..0cba8cc 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -3,7 +3,7 @@
     <name>PyVenv Manage 2</name>
     <vendor url="https://github.com/pyvenvmanage/PyVenvManage">pyvenvmanage</vendor>
 
-    <depends>PythonCore</depends>
+    <depends>com.intellij.modules.python</depends>
     <depends>com.intellij.modules.platform</depends>
 
     <extensions defaultExtensionNs="com.intellij">