From 0fbc1df4ae23e01b25b0eeaec3b664dde88841ae Mon Sep 17 00:00:00 2001 From: Carl-Robert Linnupuu Date: Wed, 27 May 2026 14:33:13 +0100 Subject: [PATCH] fix: compatibility errors --- .../codegpt/telemetry/core/service/Plugin.java | 5 ++--- .../java/ee/carlrobert/codegpt/CodeGPTPlugin.java | 12 ++++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/proxyai-telemetry/src/main/java/ee/carlrobert/codegpt/telemetry/core/service/Plugin.java b/proxyai-telemetry/src/main/java/ee/carlrobert/codegpt/telemetry/core/service/Plugin.java index 439ce408..33d19aae 100644 --- a/proxyai-telemetry/src/main/java/ee/carlrobert/codegpt/telemetry/core/service/Plugin.java +++ b/proxyai-telemetry/src/main/java/ee/carlrobert/codegpt/telemetry/core/service/Plugin.java @@ -11,8 +11,7 @@ package ee.carlrobert.codegpt.telemetry.core.service; import com.intellij.ide.plugins.IdeaPluginDescriptor; -import com.intellij.ide.plugins.PluginManagerCore; -import java.util.Arrays; +import com.intellij.ide.plugins.PluginManager; public class Plugin extends Application { @@ -30,7 +29,7 @@ public class Plugin extends Application { } private IdeaPluginDescriptor getPluginDescriptor(ClassLoader classLoader) { - return Arrays.stream(PluginManagerCore.getPlugins()) + return PluginManager.getLoadedPlugins().stream() .filter(descriptor -> classLoader.equals(descriptor.getPluginClassLoader())) .findFirst() .orElse(null); diff --git a/src/main/java/ee/carlrobert/codegpt/CodeGPTPlugin.java b/src/main/java/ee/carlrobert/codegpt/CodeGPTPlugin.java index 3649b5fb..669209f1 100644 --- a/src/main/java/ee/carlrobert/codegpt/CodeGPTPlugin.java +++ b/src/main/java/ee/carlrobert/codegpt/CodeGPTPlugin.java @@ -3,8 +3,8 @@ package ee.carlrobert.codegpt; import static java.io.File.separator; import static java.util.Objects.requireNonNull; -import com.intellij.ide.plugins.PluginManagerCore; -import com.intellij.openapi.application.PathManager; +import com.intellij.ide.plugins.IdeaPluginDescriptor; +import com.intellij.ide.plugins.PluginManager; import com.intellij.openapi.extensions.PluginId; import java.nio.file.Path; import org.jetbrains.annotations.NotNull; @@ -16,12 +16,16 @@ public final class CodeGPTPlugin { private CodeGPTPlugin() { } + private static @NotNull IdeaPluginDescriptor getDescriptor() { + return requireNonNull(PluginManager.getPlugin(CODEGPT_ID)); + } + public static @NotNull String getVersion() { - return requireNonNull(PluginManagerCore.getPlugin(CODEGPT_ID)).getVersion(); + return getDescriptor().getVersion(); } public static @NotNull Path getPluginBasePath() { - return requireNonNull(PluginManagerCore.getPlugin(CODEGPT_ID)).getPluginPath(); + return getDescriptor().getPluginPath(); } public static @NotNull String getLlamaSourcePath() {