From e4571e72d00035210e7bc992ce2a851de15c6e2e Mon Sep 17 00:00:00 2001 From: Tony Angerilli Date: Fri, 22 Oct 2021 14:47:52 -0700 Subject: [PATCH 01/10] bump the versions of various things for compatibility with 2021.2 --- CHANGELOG.md | 2 ++ gradle.properties | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 701686d..792f51f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ # IsortConnect Changelog ## [Unreleased] +### Added +- Migrate to PyCharm 2021.2 ### Changed - wrap optimize imports handler in try/catch for now ;( ## [0.0.12] diff --git a/gradle.properties b/gradle.properties index 54af7d7..a3ac184 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,15 +3,15 @@ pluginGroup = com.github.urm8.isortconnect pluginName_=IsortConnect -pluginVersion=0.0.13 +pluginVersion=0.0.14 pluginSinceBuild=202.7660.27 -pluginUntilBuild=211.* +pluginUntilBuild=212.* platformType=PY -platformVersion=2021.1 +platformVersion=2021.2 platformDownloadSources=false # Plugin Dependencies -> https://www.jetbrains.org/intellij/sdk/docs/basics/plugin_structure/plugin_dependencies.html # Example: platformPlugins = com.intellij.java,com.jetbrains.php:203.4449.22 -platformPlugins=Pythonid:211.6693.115,org.toml.lang:0.2.136.3514-203 +platformPlugins=Pythonid:212.4746.96,org.toml.lang:0.2.155.4114-212 downloadIdeaSources=false # Opt-out flag for bundling Kotlin standard library. # See https://kotlinlang.org/docs/reference/using-gradle.html#dependency-on-the-standard-library for details. From 4e9472a33c09982874570b114cf0ea036701a8db Mon Sep 17 00:00:00 2001 From: Tony Angerilli Date: Wed, 11 May 2022 22:09:43 -0700 Subject: [PATCH 02/10] another update for the latest pycharm --- CHANGELOG.md | 2 +- gradle.properties | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 792f51f..0fc8d10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ # IsortConnect Changelog ## [Unreleased] ### Added -- Migrate to PyCharm 2021.2 +- Migrate to PyCharm 2022.2 ### Changed - wrap optimize imports handler in try/catch for now ;( ## [0.0.12] diff --git a/gradle.properties b/gradle.properties index a3ac184..351b62c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,11 +3,11 @@ pluginGroup = com.github.urm8.isortconnect pluginName_=IsortConnect -pluginVersion=0.0.14 +pluginVersion=0.0.15 pluginSinceBuild=202.7660.27 -pluginUntilBuild=212.* +pluginUntilBuild=221.* platformType=PY -platformVersion=2021.2 +platformVersion=2022.1 platformDownloadSources=false # Plugin Dependencies -> https://www.jetbrains.org/intellij/sdk/docs/basics/plugin_structure/plugin_dependencies.html # Example: platformPlugins = com.intellij.java,com.jetbrains.php:203.4449.22 From 0d9f540c742c9d06ad41877e0dc079ab468bab31 Mon Sep 17 00:00:00 2001 From: Tony Angerilli Date: Wed, 11 May 2022 22:17:39 -0700 Subject: [PATCH 03/10] update the Pythonid --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 351b62c..73ab666 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ platformVersion=2022.1 platformDownloadSources=false # Plugin Dependencies -> https://www.jetbrains.org/intellij/sdk/docs/basics/plugin_structure/plugin_dependencies.html # Example: platformPlugins = com.intellij.java,com.jetbrains.php:203.4449.22 -platformPlugins=Pythonid:212.4746.96,org.toml.lang:0.2.155.4114-212 +platformPlugins=Pythonid:221.5080.212,org.toml.lang:0.2.155.4114-212 downloadIdeaSources=false # Opt-out flag for bundling Kotlin standard library. # See https://kotlinlang.org/docs/reference/using-gradle.html#dependency-on-the-standard-library for details. From 36fcf48d4c88fced265fe46e4450f188574a8079 Mon Sep 17 00:00:00 2001 From: Tony Angerilli Date: Wed, 11 May 2022 23:13:33 -0700 Subject: [PATCH 04/10] try another pythonid version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 73ab666..66e1ef8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ platformVersion=2022.1 platformDownloadSources=false # Plugin Dependencies -> https://www.jetbrains.org/intellij/sdk/docs/basics/plugin_structure/plugin_dependencies.html # Example: platformPlugins = com.intellij.java,com.jetbrains.php:203.4449.22 -platformPlugins=Pythonid:221.5080.212,org.toml.lang:0.2.155.4114-212 +platformPlugins=Pythonid:PY-221.5080.212,org.toml.lang:0.2.155.4114-212 downloadIdeaSources=false # Opt-out flag for bundling Kotlin standard library. # See https://kotlinlang.org/docs/reference/using-gradle.html#dependency-on-the-standard-library for details. From ff4a8a80bf11c8bc10731633abe002d1ea1d69a9 Mon Sep 17 00:00:00 2001 From: Tony Angerilli Date: Wed, 11 May 2022 23:16:49 -0700 Subject: [PATCH 05/10] another variant --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 66e1ef8..f1e0902 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ platformVersion=2022.1 platformDownloadSources=false # Plugin Dependencies -> https://www.jetbrains.org/intellij/sdk/docs/basics/plugin_structure/plugin_dependencies.html # Example: platformPlugins = com.intellij.java,com.jetbrains.php:203.4449.22 -platformPlugins=Pythonid:PY-221.5080.212,org.toml.lang:0.2.155.4114-212 +platformPlugins=Pythonid:2022.1,org.toml.lang:0.2.155.4114-212 downloadIdeaSources=false # Opt-out flag for bundling Kotlin standard library. # See https://kotlinlang.org/docs/reference/using-gradle.html#dependency-on-the-standard-library for details. From 34bb5519e69d9e225c36e31a5d9f6988c263e33c Mon Sep 17 00:00:00 2001 From: Tony Angerilli Date: Wed, 11 May 2022 23:29:39 -0700 Subject: [PATCH 06/10] trying the version from https://plugins.jetbrains.com/plugin/631-python --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f1e0902..d98dd0f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ platformVersion=2022.1 platformDownloadSources=false # Plugin Dependencies -> https://www.jetbrains.org/intellij/sdk/docs/basics/plugin_structure/plugin_dependencies.html # Example: platformPlugins = com.intellij.java,com.jetbrains.php:203.4449.22 -platformPlugins=Pythonid:2022.1,org.toml.lang:0.2.155.4114-212 +platformPlugins=Pythonid:221.5591.52,org.toml.lang:0.2.155.4114-212 downloadIdeaSources=false # Opt-out flag for bundling Kotlin standard library. # See https://kotlinlang.org/docs/reference/using-gradle.html#dependency-on-the-standard-library for details. From ae47ae0309eb5330b9e348c1f2f07633f8290b28 Mon Sep 17 00:00:00 2001 From: Tony Angerilli Date: Thu, 12 May 2022 07:56:52 -0700 Subject: [PATCH 07/10] what if we just don't specify the platformPlugins --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d98dd0f..b7353c2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ platformVersion=2022.1 platformDownloadSources=false # Plugin Dependencies -> https://www.jetbrains.org/intellij/sdk/docs/basics/plugin_structure/plugin_dependencies.html # Example: platformPlugins = com.intellij.java,com.jetbrains.php:203.4449.22 -platformPlugins=Pythonid:221.5591.52,org.toml.lang:0.2.155.4114-212 +#platformPlugins=Pythonid:221.5591.52,org.toml.lang:0.2.155.4114-212 downloadIdeaSources=false # Opt-out flag for bundling Kotlin standard library. # See https://kotlinlang.org/docs/reference/using-gradle.html#dependency-on-the-standard-library for details. From c047b6e71d7ee1bc1e3baf28508d249644ac161f Mon Sep 17 00:00:00 2001 From: Tony Angerilli Date: Thu, 12 May 2022 08:12:50 -0700 Subject: [PATCH 08/10] try version from blackconnect --- build.gradle.kts | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 616318c..0a2bc8b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { // Kotlin support id("org.jetbrains.kotlin.jvm") version "1.4.10" // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin - id("org.jetbrains.intellij") version "0.5.0" + id("org.jetbrains.intellij") version "1.5.3" // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin id("org.jetbrains.changelog") version "0.6.2" // ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle @@ -52,13 +52,18 @@ dependencies { // Configure gradle-intellij-plugin plugin. // Read more: https://github.com/JetBrains/gradle-intellij-plugin intellij { - pluginName = pluginName_ - version = platformVersion - type = platformType - downloadSources = false - updateSinceUntilBuild = true - // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file. +// pluginName = pluginName_ +// version = platformVersion +// type = platformType +// downloadSources = false +// updateSinceUntilBuild = true +// // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file. setPlugins(*platformPlugins.split(',').map(String::trim).filter(String::isNotEmpty).toTypedArray()) + val ideaVersion: String by project + version.set(ideaVersion) + updateSinceUntilBuild.set(true) + pluginName.set(pluginName_) + plugins.set(listOf("Pythonid")) } tasks { From 191490a4cc25e9158c7432f801a815f102b48770 Mon Sep 17 00:00:00 2001 From: Tony Angerilli Date: Thu, 12 May 2022 08:16:20 -0700 Subject: [PATCH 09/10] fine, fix the syntax --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 0a2bc8b..9f725ac 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -63,7 +63,7 @@ intellij { version.set(ideaVersion) updateSinceUntilBuild.set(true) pluginName.set(pluginName_) - plugins.set(listOf("Pythonid")) + setPlugins(listOf("Pythonid")) } tasks { From 46b8d7517a893082d44ad16db3bdea11e7879859 Mon Sep 17 00:00:00 2001 From: Tony Angerilli Date: Thu, 12 May 2022 08:19:52 -0700 Subject: [PATCH 10/10] forgot to comment out the old version --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9f725ac..8689d09 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -58,7 +58,7 @@ intellij { // downloadSources = false // updateSinceUntilBuild = true // // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file. - setPlugins(*platformPlugins.split(',').map(String::trim).filter(String::isNotEmpty).toTypedArray()) +// setPlugins(*platformPlugins.split(',').map(String::trim).filter(String::isNotEmpty).toTypedArray()) val ideaVersion: String by project version.set(ideaVersion) updateSinceUntilBuild.set(true)