From 1edea138cf5e41b07523d7f57de2247bb362a292 Mon Sep 17 00:00:00 2001 From: Carl-Robert Linnupuu Date: Wed, 13 Mar 2024 11:53:15 +0200 Subject: [PATCH] chore: bump sinceBuild and javaVersion --- gradle.properties | 6 +++--- .../codecompletions/CodeCompletionEventListener.java | 2 -- .../codecompletions/CodeCompletionRequestProvider.java | 2 -- .../codegpt/codecompletions/CodeCompletionService.java | 2 -- .../codegpt/settings/service/custom/CustomServiceForm.java | 2 +- .../service/llama/form/LlamaServerPreferencesForm.java | 2 +- .../codegpt/settings/service/openai/OpenAISettingsForm.java | 2 +- 7 files changed, 6 insertions(+), 12 deletions(-) diff --git a/gradle.properties b/gradle.properties index 082992d3..245e7d22 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,18 +7,18 @@ pluginRepositoryUrl = https://github.com/carlrobertoh/CodeGPT pluginVersion = 2.5.0 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html -pluginSinceBuild = 213 +pluginSinceBuild = 222 pluginUntilBuild = # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType = IC -platformVersion = 2022.2 +platformVersion = LATEST-EAP-SNAPSHOT # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 platformPlugins = -javaVersion = 11 +javaVersion = 17 # Gradle Releases -> https://github.com/gradle/gradle/releases gradleVersion = 8.5 diff --git a/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionEventListener.java b/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionEventListener.java index 9b9b9a20..dc7419ac 100644 --- a/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionEventListener.java +++ b/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionEventListener.java @@ -17,11 +17,9 @@ import ee.carlrobert.codegpt.util.file.FileUtil; import ee.carlrobert.llm.client.openai.completion.ErrorDetails; import ee.carlrobert.llm.completion.CompletionEventListener; import java.io.IOException; -import javax.annotation.ParametersAreNonnullByDefault; import javax.swing.SwingUtilities; import org.jetbrains.annotations.Nullable; -@ParametersAreNonnullByDefault class CodeCompletionEventListener implements CompletionEventListener { private static final Logger LOG = Logger.getInstance(CodeCompletionEventListener.class); diff --git a/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionRequestProvider.java b/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionRequestProvider.java index 49a6f25a..15ec576b 100644 --- a/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionRequestProvider.java +++ b/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionRequestProvider.java @@ -4,9 +4,7 @@ import ee.carlrobert.codegpt.completions.llama.LlamaModel; import ee.carlrobert.codegpt.settings.service.llama.LlamaSettings; import ee.carlrobert.llm.client.llama.completion.LlamaCompletionRequest; import ee.carlrobert.llm.client.openai.completion.request.OpenAITextCompletionRequest; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault public class CodeCompletionRequestProvider { private static final int MAX_TOKENS = 128; diff --git a/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionService.java b/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionService.java index 4e80f0e2..3b3bc6be 100644 --- a/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionService.java +++ b/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionService.java @@ -42,12 +42,10 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.regex.PatternSyntaxException; import java.util.stream.Stream; -import javax.annotation.ParametersAreNonnullByDefault; import javax.swing.KeyStroke; import org.jetbrains.annotations.NotNull; @Service(PROJECT) -@ParametersAreNonnullByDefault public final class CodeCompletionService implements Disposable { public static final String APPLY_INLAY_ACTION_ID = "ApplyInlayAction"; diff --git a/src/main/java/ee/carlrobert/codegpt/settings/service/custom/CustomServiceForm.java b/src/main/java/ee/carlrobert/codegpt/settings/service/custom/CustomServiceForm.java index 8837ff37..97d5a17d 100644 --- a/src/main/java/ee/carlrobert/codegpt/settings/service/custom/CustomServiceForm.java +++ b/src/main/java/ee/carlrobert/codegpt/settings/service/custom/CustomServiceForm.java @@ -27,12 +27,12 @@ import java.awt.BorderLayout; import java.awt.FlowLayout; import java.net.MalformedURLException; import java.net.URL; -import javax.annotation.Nullable; import javax.swing.Box; import javax.swing.JButton; import javax.swing.JPanel; import javax.swing.SwingUtilities; import okhttp3.sse.EventSource; +import org.jetbrains.annotations.Nullable; public class CustomServiceForm { diff --git a/src/main/java/ee/carlrobert/codegpt/settings/service/llama/form/LlamaServerPreferencesForm.java b/src/main/java/ee/carlrobert/codegpt/settings/service/llama/form/LlamaServerPreferencesForm.java index 39ea1579..ac938ff5 100644 --- a/src/main/java/ee/carlrobert/codegpt/settings/service/llama/form/LlamaServerPreferencesForm.java +++ b/src/main/java/ee/carlrobert/codegpt/settings/service/llama/form/LlamaServerPreferencesForm.java @@ -37,11 +37,11 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; -import javax.annotation.Nullable; import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.SwingConstants; +import org.jetbrains.annotations.Nullable; public class LlamaServerPreferencesForm { diff --git a/src/main/java/ee/carlrobert/codegpt/settings/service/openai/OpenAISettingsForm.java b/src/main/java/ee/carlrobert/codegpt/settings/service/openai/OpenAISettingsForm.java index b6a3fb0a..d77a7b7d 100644 --- a/src/main/java/ee/carlrobert/codegpt/settings/service/openai/OpenAISettingsForm.java +++ b/src/main/java/ee/carlrobert/codegpt/settings/service/openai/OpenAISettingsForm.java @@ -13,8 +13,8 @@ import ee.carlrobert.codegpt.CodeGPTBundle; import ee.carlrobert.codegpt.credentials.OpenAICredentialManager; import ee.carlrobert.codegpt.ui.UIUtil; import ee.carlrobert.llm.client.openai.completion.OpenAIChatCompletionModel; -import javax.annotation.Nullable; import javax.swing.JPanel; +import org.jetbrains.annotations.Nullable; public class OpenAISettingsForm {