From b4dc341e9bb4cbf89e942e28fd503170b203eef5 Mon Sep 17 00:00:00 2001 From: Clay Livince Date: Fri, 6 May 2022 15:47:22 +0800 Subject: [PATCH 1/5] fix: for 2022.1 version code has been changed to 1.9.6 --- .idea/compiler.xml | 2 +- .idea/libraries-with-intellij-classes.xml | 65 +++++++++++++++++++++++ .idea/misc.xml | 3 ++ build.gradle | 7 +-- gradle.properties | 15 ++++-- pluginVersion.txt | 2 +- 6 files changed, 84 insertions(+), 10 deletions(-) create mode 100644 .idea/libraries-with-intellij-classes.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 9fde4533..e757a31a 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,6 +2,6 @@ \ No newline at end of file diff --git a/.idea/libraries-with-intellij-classes.xml b/.idea/libraries-with-intellij-classes.xml new file mode 100644 index 00000000..9fa31567 --- /dev/null +++ b/.idea/libraries-with-intellij-classes.xml @@ -0,0 +1,65 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 8c035d6a..1e0fef27 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,9 @@ + + + diff --git a/build.gradle b/build.gradle index d5584d2e..89af155e 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { plugins { id "org.jetbrains.changelog" version '0.6.2' - id "org.jetbrains.intellij" version "1.2.1" + id 'org.jetbrains.intellij' version '1.5.2' } apply plugin: 'org.jetbrains.changelog' @@ -36,8 +36,8 @@ ext { allprojects { apply plugin: 'java' - sourceCompatibility = '1.8' - targetCompatibility = '1.8' + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 compileJava.options.encoding = "UTF-8" compileTestJava.options.encoding = "UTF-8" @@ -130,6 +130,7 @@ allprojects { } intellij { + version = '2022.1' plugins = myPlugins pluginName = 'kite-pycharm' updateSinceUntilBuild = false diff --git a/gradle.properties b/gradle.properties index 4b0a939e..37b13767 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -sinceBuild = 213.0 -untilBuild = 213.* +sinceBuild = 221.0 +untilBuild = 221.* #2021.1 #ideaVersion = IC-2021.1 @@ -12,6 +12,11 @@ untilBuild = 213.* #goPlugin = org.jetbrains.plugins.go:212.4746.92 # 2021.3 -ideaVersion = IC-213.5605.12-EAP-SNAPSHOT -pycharmPlugin = PythonCore:213.5605.80 -goPlugin = org.jetbrains.plugins.go:213.5605.12 \ No newline at end of file +#ideaVersion = IC-213.5605.12-EAP-SNAPSHOT +#pycharmPlugin = PythonCore:213.5605.80 +#goPlugin = org.jetbrains.plugins.go:213.5605.12 + +#2022.1 +ideaVersion = IC-221.5080.210 +pycharmPlugin = PythonCore:221.5080.210 +goPlugin = org.jetbrains.plugins.go:221.5080.210 \ No newline at end of file diff --git a/pluginVersion.txt b/pluginVersion.txt index 6ecac681..b4cac6fa 100644 --- a/pluginVersion.txt +++ b/pluginVersion.txt @@ -1 +1 @@ -1.9.5 \ No newline at end of file +1.9.6 \ No newline at end of file From 60b03e286662e8616558b8b8c5cda8e2a84da69f Mon Sep 17 00:00:00 2001 From: PavelA Date: Tue, 2 Aug 2022 11:57:34 +0300 Subject: [PATCH 2/5] fix 2022.2 --- build.gradle | 2 +- gradle.properties | 10 +++++----- pluginVersion.txt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 89af155e..ce7a4b5d 100644 --- a/build.gradle +++ b/build.gradle @@ -130,7 +130,7 @@ allprojects { } intellij { - version = '2022.1' + version = '2022.2' plugins = myPlugins pluginName = 'kite-pycharm' updateSinceUntilBuild = false diff --git a/gradle.properties b/gradle.properties index 37b13767..81e24bbf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -sinceBuild = 221.0 -untilBuild = 221.* +sinceBuild = 222.0 +untilBuild = 222.* #2021.1 #ideaVersion = IC-2021.1 @@ -17,6 +17,6 @@ untilBuild = 221.* #goPlugin = org.jetbrains.plugins.go:213.5605.12 #2022.1 -ideaVersion = IC-221.5080.210 -pycharmPlugin = PythonCore:221.5080.210 -goPlugin = org.jetbrains.plugins.go:221.5080.210 \ No newline at end of file +ideaVersion = IU-222.3345.118 +pycharmPlugin = PythonCore:222.3345.131 +goPlugin = org.jetbrains.plugins.go:222.3345.118 \ No newline at end of file diff --git a/pluginVersion.txt b/pluginVersion.txt index b4cac6fa..0b9006ea 100644 --- a/pluginVersion.txt +++ b/pluginVersion.txt @@ -1 +1 @@ -1.9.6 \ No newline at end of file +1.9.7 \ No newline at end of file From 0bbbc93b2b15b285afe1662d2f8e62e3f6c06235 Mon Sep 17 00:00:00 2001 From: Wh1isper <9573586@qq.com> Date: Sun, 2 Apr 2023 16:19:10 +0800 Subject: [PATCH 3/5] try fix 2023.1 --- .gitignore | 2 +- .idea/$PRODUCT_WORKSPACE_FILE$ | 19 -- .idea/.gitignore | 4 - .idea/.name | 1 - .idea/codeStyleSettings.xml | 328 ---------------------- .idea/compiler.xml | 7 - .idea/encodings.xml | 6 - .idea/gradle.xml | 21 -- .idea/jarRepositories.xml | 35 --- .idea/libraries-with-intellij-classes.xml | 65 ----- .idea/misc.xml | 90 ------ .idea/runConfigurations/All_Tests.xml | 21 -- .idea/runConfigurations/Plugin.xml | 21 -- .idea/templateLanguages.xml | 6 - .idea/uiDesigner.xml | 141 ---------- .idea/vcs.xml | 7 - build.gradle | 2 +- gradle.properties | 15 +- pluginVersion.txt | 2 +- 19 files changed, 13 insertions(+), 780 deletions(-) delete mode 100644 .idea/$PRODUCT_WORKSPACE_FILE$ delete mode 100644 .idea/.gitignore delete mode 100644 .idea/.name delete mode 100644 .idea/codeStyleSettings.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/libraries-with-intellij-classes.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/runConfigurations/All_Tests.xml delete mode 100644 .idea/runConfigurations/Plugin.xml delete mode 100644 .idea/templateLanguages.xml delete mode 100644 .idea/uiDesigner.xml delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index cbdebfa3..e72eee13 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ .DS_Store .gradle -.idea/workspace.xml +.idea/* build/ out/ cache/ diff --git a/.idea/$PRODUCT_WORKSPACE_FILE$ b/.idea/$PRODUCT_WORKSPACE_FILE$ deleted file mode 100644 index 3733e0d3..00000000 --- a/.idea/$PRODUCT_WORKSPACE_FILE$ +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - 1.8 - - - - - - - - \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 62601d88..00000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# Editor-based HTTP Client requests -/httpRequests/ -# Default ignored files -/shelf/ \ No newline at end of file diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 8602c800..00000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -kite-intellij-plugin \ No newline at end of file diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index 4ae8d3ab..00000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,328 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index e757a31a..00000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 4987ecab..00000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 3935e371..00000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index 26101af5..00000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries-with-intellij-classes.xml b/.idea/libraries-with-intellij-classes.xml deleted file mode 100644 index 9fa31567..00000000 --- a/.idea/libraries-with-intellij-classes.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 1e0fef27..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/All_Tests.xml b/.idea/runConfigurations/All_Tests.xml deleted file mode 100644 index af0c38b9..00000000 --- a/.idea/runConfigurations/All_Tests.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - true - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Plugin.xml b/.idea/runConfigurations/Plugin.xml deleted file mode 100644 index 4a0b6b7d..00000000 --- a/.idea/runConfigurations/Plugin.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - true - - - \ No newline at end of file diff --git a/.idea/templateLanguages.xml b/.idea/templateLanguages.xml deleted file mode 100644 index 046e9a38..00000000 --- a/.idea/templateLanguages.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index bf322892..00000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 5d7764b8..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle index ce7a4b5d..890c7ea8 100644 --- a/build.gradle +++ b/build.gradle @@ -130,7 +130,7 @@ allprojects { } intellij { - version = '2022.2' + version = '2023.1' plugins = myPlugins pluginName = 'kite-pycharm' updateSinceUntilBuild = false diff --git a/gradle.properties b/gradle.properties index 81e24bbf..f48265d1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -sinceBuild = 222.0 -untilBuild = 222.* +sinceBuild = 223.0 +untilBuild = 223.* #2021.1 #ideaVersion = IC-2021.1 @@ -17,6 +17,11 @@ untilBuild = 222.* #goPlugin = org.jetbrains.plugins.go:213.5605.12 #2022.1 -ideaVersion = IU-222.3345.118 -pycharmPlugin = PythonCore:222.3345.131 -goPlugin = org.jetbrains.plugins.go:222.3345.118 \ No newline at end of file +#ideaVersion = IU-222.3345.118 +#pycharmPlugin = PythonCore:222.3345.131 +#goPlugin = org.jetbrains.plugins.go:222.3345.118 + +#2023.1 +ideaVersion = IU-231.8109.175 +pycharmPlugin = PythonCore:231.8109.144 +goPlugin = org.jetbrains.plugins.go:231.8109.175 \ No newline at end of file diff --git a/pluginVersion.txt b/pluginVersion.txt index 0b9006ea..f5f0aa63 100644 --- a/pluginVersion.txt +++ b/pluginVersion.txt @@ -1 +1 @@ -1.9.7 \ No newline at end of file +1.9.8 \ No newline at end of file From 7582446f820c64b37f13fb925149a1c80d09e474 Mon Sep 17 00:00:00 2001 From: Wh1isper <9573586@qq.com> Date: Sun, 2 Apr 2023 16:48:17 +0800 Subject: [PATCH 4/5] drop SystemInfo.isWin7OrNewer --- src/main/java/com/kite/intellij/platform/KitePlatform.java | 3 +-- .../com/kite/intellij/startup/KiteProjectManagerListener.java | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/kite/intellij/platform/KitePlatform.java b/src/main/java/com/kite/intellij/platform/KitePlatform.java index 6de67dd5..c5cd20f6 100644 --- a/src/main/java/com/kite/intellij/platform/KitePlatform.java +++ b/src/main/java/com/kite/intellij/platform/KitePlatform.java @@ -23,8 +23,7 @@ public static boolean isOsVersionSupported() { } if (SystemInfo.isWindows) { - LOG.debug("OS: Windows " + SystemInfo.isWin7OrNewer + ", 64 bit: " + SystemInfo.is64Bit); - return SystemInfo.isWin7OrNewer /*&& SystemInfo.is64Bit*/; //the arch seems to equal the Java VM arch, but we need the installed OS architecture, disabled for now + return true; } if (SystemInfo.isLinux) { diff --git a/src/main/java/com/kite/intellij/startup/KiteProjectManagerListener.java b/src/main/java/com/kite/intellij/startup/KiteProjectManagerListener.java index 2ed674eb..61b85503 100644 --- a/src/main/java/com/kite/intellij/startup/KiteProjectManagerListener.java +++ b/src/main/java/com/kite/intellij/startup/KiteProjectManagerListener.java @@ -135,8 +135,6 @@ private boolean downloadAndInstallKite() { * @return {@code true} if the current IDE is incompatible with the autostart feature. */ private static boolean disallowKitedAutostart() { - return SystemInfo.isWin7OrNewer - && !SystemInfo.isWin8OrNewer - && ApplicationInfo.getInstance().getBuild().getBaselineVersion() == 193; + return false; } } From a1779e3b7d45b728406f69717ac28401dc027363 Mon Sep 17 00:00:00 2001 From: Wh1isper <9573586@qq.com> Date: Sun, 2 Apr 2023 17:25:18 +0800 Subject: [PATCH 5/5] Not upgrade UI version --- gradle.properties | 15 +++++---------- .../com/kite/intellij/platform/KitePlatform.java | 4 ++-- .../startup/KiteProjectManagerListener.java | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/gradle.properties b/gradle.properties index f48265d1..d09a1915 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -sinceBuild = 223.0 -untilBuild = 223.* +sinceBuild = 222.0 +untilBuild = 231.* #2021.1 #ideaVersion = IC-2021.1 @@ -17,11 +17,6 @@ untilBuild = 223.* #goPlugin = org.jetbrains.plugins.go:213.5605.12 #2022.1 -#ideaVersion = IU-222.3345.118 -#pycharmPlugin = PythonCore:222.3345.131 -#goPlugin = org.jetbrains.plugins.go:222.3345.118 - -#2023.1 -ideaVersion = IU-231.8109.175 -pycharmPlugin = PythonCore:231.8109.144 -goPlugin = org.jetbrains.plugins.go:231.8109.175 \ No newline at end of file +ideaVersion = IU-222.3345.118 +pycharmPlugin = PythonCore:222.3345.131 +goPlugin = org.jetbrains.plugins.go:222.3345.118 diff --git a/src/main/java/com/kite/intellij/platform/KitePlatform.java b/src/main/java/com/kite/intellij/platform/KitePlatform.java index c5cd20f6..6750bbf0 100644 --- a/src/main/java/com/kite/intellij/platform/KitePlatform.java +++ b/src/main/java/com/kite/intellij/platform/KitePlatform.java @@ -23,7 +23,7 @@ public static boolean isOsVersionSupported() { } if (SystemInfo.isWindows) { - return true; + return true; } if (SystemInfo.isLinux) { @@ -46,4 +46,4 @@ public static boolean isOsVersionNotSupported() { return !isOsVersionSupported(); } } - \ No newline at end of file + diff --git a/src/main/java/com/kite/intellij/startup/KiteProjectManagerListener.java b/src/main/java/com/kite/intellij/startup/KiteProjectManagerListener.java index 61b85503..596cd3f2 100644 --- a/src/main/java/com/kite/intellij/startup/KiteProjectManagerListener.java +++ b/src/main/java/com/kite/intellij/startup/KiteProjectManagerListener.java @@ -135,6 +135,6 @@ private boolean downloadAndInstallKite() { * @return {@code true} if the current IDE is incompatible with the autostart feature. */ private static boolean disallowKitedAutostart() { - return false; + return false; } }