From 00c9813eeb74de65008fba91e5942336fd69f694 Mon Sep 17 00:00:00 2001 From: Rene Leonhardt <65483435+reneleonhardt@users.noreply.github.com> Date: Sun, 7 Apr 2024 15:53:59 +0200 Subject: [PATCH] chore(deps): Update checkstyle to 10.15.0 (#438) * Cleaned versions catalog and dependencies * Fixed checkstyle finding --- build.gradle.kts | 6 +++++- .../src/main/kotlin/codegpt.java-conventions.gradle.kts | 2 +- gradle/libs.versions.toml | 7 +++---- .../completions/you/auth/YouAuthenticationService.java | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 5ce2eaf3..53825dc1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,6 +29,10 @@ plugins { group = properties("pluginGroup").get() version = properties("pluginVersion").get() + "-" + properties("pluginSinceBuild").get() +checkstyle { + toolVersion = libs.versions.checkstyle.get() +} + repositories { mavenCentral() gradlePluginPortal() @@ -50,7 +54,7 @@ dependencies { implementation(project(":codegpt-telemetry")) implementation(project(":codegpt-treesitter")) - implementation(enforcedPlatform("com.fasterxml.jackson:jackson-bom:${libs.versions.jackson.get()}")) + implementation(enforcedPlatform(libs.jackson.bom)) implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8") implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") implementation(libs.flexmark.all) { diff --git a/buildSrc/src/main/kotlin/codegpt.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/codegpt.java-conventions.gradle.kts index f42cd97f..0a578abf 100644 --- a/buildSrc/src/main/kotlin/codegpt.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/codegpt.java-conventions.gradle.kts @@ -22,7 +22,7 @@ intellij { } checkstyle { - toolVersion = "10.12.5" + toolVersion = "10.15.0" } dependencies { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8d2e3bde..13b69c36 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] analytics = "3.0.0" -assertj = "3.25.3" changelog = "2.2.0" +checkstyle = "10.15.0" commons-text = "1.11.0" flexmark = "0.64.8" -gradle-intellij-plugin-version="1.17.3" +gradle-intellij-plugin-version = "1.17.3" jackson = "2.17.0" jsoup = "1.17.2" jtokkit = "1.0.0" @@ -15,13 +15,12 @@ tree-sitter = "0.22.2" [libraries] analytics = { module = "com.rudderstack.sdk.java.analytics:analytics", version.ref = "analytics" } -assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertj" } commons-text = { module = "org.apache.commons:commons-text", version.ref = "commons-text" } flexmark-all = { module = "com.vladsch.flexmark:flexmark-all", version.ref = "flexmark" } gradle-intellij-plugin = { module = "org.jetbrains.intellij.plugins:gradle-intellij-plugin", version.ref = "gradle-intellij-plugin-version" } jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" } jtokkit = { module = "com.knuddels:jtokkit", version.ref = "jtokkit" } -junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" } +jackson-bom = { module = "com.fasterxml.jackson:jackson-bom", version.ref = "jackson" } kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } llm-client = { module = "ee.carlrobert:llm-client", version.ref = "llm-client" } tree-sitter = { module = "io.github.bonede:tree-sitter", version.ref = "tree-sitter" } diff --git a/src/main/java/ee/carlrobert/codegpt/completions/you/auth/YouAuthenticationService.java b/src/main/java/ee/carlrobert/codegpt/completions/you/auth/YouAuthenticationService.java index a7d195ed..f6e20b72 100644 --- a/src/main/java/ee/carlrobert/codegpt/completions/you/auth/YouAuthenticationService.java +++ b/src/main/java/ee/carlrobert/codegpt/completions/you/auth/YouAuthenticationService.java @@ -60,7 +60,6 @@ public final class YouAuthenticationService { if (response.code() == 200) { try { - var messageBus = ApplicationManager.getApplication().getMessageBus(); var userManager = YouUserManager.getInstance(); var authenticationResponse = @@ -72,6 +71,7 @@ public final class YouAuthenticationService { YouApiClient.getInstance().getSubscription(authenticationResponse); var subscribed = subscription != null && "youpro".equals(subscription.getService()); userManager.setSubscribed(subscribed); + var messageBus = ApplicationManager.getApplication().getMessageBus(); if (subscribed) { messageBus.syncPublisher(YouSubscriptionNotifier.SUBSCRIPTION_TOPIC).subscribed(); }