From a1446aae21d624b62687b0ea0fcb856a0d31df45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 20:15:25 +0200 Subject: [PATCH 1/3] Bump com.diffplug.spotless from 6.3.0 to 6.4.0 (#698) Bumps com.diffplug.spotless from 6.3.0 to 6.4.0. --- updated-dependencies: - dependency-name: com.diffplug.spotless dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index d361d983e..49f93c109 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,7 +8,7 @@ pluginManagement { id 'com.avast.gradle.docker-compose' version "0.15.2" apply false id 'io.gitlab.arturbosch.detekt' version "1.19.0" apply false id 'com.apollographql.apollo3' version "3.1.0" apply false - id 'com.diffplug.spotless' version '6.3.0' apply false + id 'com.diffplug.spotless' version '6.4.0' apply false } } From 530044d7def26e937bd0b02634bac60dbcf87d81 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Tue, 29 Mar 2022 14:52:11 -0400 Subject: [PATCH 2/3] temp fixes #699 (#700) --- build.gradle.kts | 4 ++-- gradle.properties | 2 +- marker/build.gradle.kts | 2 +- marker/jvm-marker/build.gradle.kts | 2 +- marker/py-marker/build.gradle.kts | 2 +- monitor/build.gradle.kts | 2 +- plugin/build.gradle.kts | 4 ++-- .../settings/PluginConfigurationPanel.java | 23 +++++++++++-------- 8 files changed, 22 insertions(+), 19 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1b6f2d6b7..f36883ca7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -83,10 +83,10 @@ subprojects { tasks { register("downloadProbe") { doLast { - val f = File(projectDir, "test/e2e/spp-probe-$projectVersion.jar") + val f = File(projectDir, "test/e2e/spp-probe-0.4.4.jar") if (!f.exists()) { println("Downloading Source++ JVM probe") - java.net.URL("https://github.com/sourceplusplus/probe-jvm/releases/download/$projectVersion/spp-probe-$projectVersion.jar") + java.net.URL("https://github.com/sourceplusplus/probe-jvm/releases/download/0.4.4/spp-probe-0.4.4.jar") .openStream().use { input -> java.io.FileOutputStream(f).use { output -> input.copyTo(output) diff --git a/gradle.properties b/gradle.properties index 070f00a12..6c43a6b45 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ kotlin.code.style=official pluginGroup = spp.jetbrains pluginName = Source++ -projectVersion=0.4.4 +projectVersion=0.4.5 pluginSinceBuild = 202.4357 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl # See https://jb.gg/intellij-platform-builds-list for available build versions diff --git a/marker/build.gradle.kts b/marker/build.gradle.kts index b72d62368..bbf72460e 100644 --- a/marker/build.gradle.kts +++ b/marker/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { val intellijVersion = "213.7172.25" compileOnly("org.jooq:joor:$joorVersion") - compileOnly("com.github.sourceplusplus.protocol:protocol:$projectVersion") + compileOnly("com.github.sourceplusplus.protocol:protocol:0.4.4") compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinVersion") compileOnly("org.jetbrains.kotlin:kotlin-stdlib-jdk8") compileOnly("com.google.guava:guava:31.1-jre") diff --git a/marker/jvm-marker/build.gradle.kts b/marker/jvm-marker/build.gradle.kts index 86ddb179b..e15433649 100644 --- a/marker/jvm-marker/build.gradle.kts +++ b/marker/jvm-marker/build.gradle.kts @@ -21,7 +21,7 @@ dependencies { compileOnly(project(":marker")) compileOnly(project(":monitor")) } - compileOnly("com.github.sourceplusplus.protocol:protocol:$projectVersion") + compileOnly("com.github.sourceplusplus.protocol:protocol:0.4.4") val intellijVersion = "213.7172.25" implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinVersion") diff --git a/marker/py-marker/build.gradle.kts b/marker/py-marker/build.gradle.kts index 6c8bd66a3..3f1da3eae 100644 --- a/marker/py-marker/build.gradle.kts +++ b/marker/py-marker/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { } else { compileOnly(project(":marker")) } - compileOnly("com.github.sourceplusplus.protocol:protocol:$projectVersion") + compileOnly("com.github.sourceplusplus.protocol:protocol:0.4.4") val intellijVersion = "213.7172.25" implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinVersion") diff --git a/monitor/build.gradle.kts b/monitor/build.gradle.kts index 5b090150c..b7d933cac 100644 --- a/monitor/build.gradle.kts +++ b/monitor/build.gradle.kts @@ -10,7 +10,7 @@ val projectVersion: String by project val slf4jVersion: String by project dependencies { - implementation("com.github.sourceplusplus.protocol:protocol:$projectVersion") + implementation("com.github.sourceplusplus.protocol:protocol:0.4.4") implementation("org.slf4j:slf4j-api:$slf4jVersion") implementation("com.apollographql.apollo3:apollo-runtime:$apolloVersion") api("com.apollographql.apollo3:apollo-api:$apolloVersion") diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index f02d95215..b881cabf8 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -61,8 +61,8 @@ dependencies { implementation(project(":marker:jvm-marker")) implementation(project(":marker:py-marker")) implementation(project(":monitor")) - implementation("com.github.sourceplusplus.interface-portal:portal-jvm:$projectVersion") { isTransitive = false } - implementation("com.github.sourceplusplus.protocol:protocol:$projectVersion") + implementation("com.github.sourceplusplus.interface-portal:portal-jvm:0.4.4") { isTransitive = false } + implementation("com.github.sourceplusplus.protocol:protocol:0.4.4") } implementation("org.jooq:joor:$joorVersion") diff --git a/plugin/src/main/java/spp/jetbrains/sourcemarker/settings/PluginConfigurationPanel.java b/plugin/src/main/java/spp/jetbrains/sourcemarker/settings/PluginConfigurationPanel.java index a91401675..4951fe8c2 100644 --- a/plugin/src/main/java/spp/jetbrains/sourcemarker/settings/PluginConfigurationPanel.java +++ b/plugin/src/main/java/spp/jetbrains/sourcemarker/settings/PluginConfigurationPanel.java @@ -46,17 +46,20 @@ public PluginConfigurationPanel(SourceMarkerConfig config) { myServiceSettingsPanel.setBorder(IdeBorderFactory.createTitledBorder(message("service_settings"))); myGlobalSettingsPanel.setBorder(IdeBorderFactory.createTitledBorder(message("plugin_settings"))); - INSTANCE.getLiveService().getServices().onComplete(it -> { - if (it.succeeded()) { - it.result().forEach(service -> serviceComboBox.addItem(service.getName())); - - if (config.getServiceName() != null) { - serviceComboBox.setSelectedItem(config.getServiceName()); + //todo: properly ensure live service can never be null + if (INSTANCE.getLiveService() != null) { + INSTANCE.getLiveService().getServices().onComplete(it -> { + if (it.succeeded()) { + it.result().forEach(service -> serviceComboBox.addItem(service.getName())); + + if (config.getServiceName() != null) { + serviceComboBox.setSelectedItem(config.getServiceName()); + } + } else { + it.cause().printStackTrace(); } - } else { - it.cause().printStackTrace(); - } - }); + }); + } } public JComponent getContentPane() { From 9875e00fde05b422a18de7045ae794f5cbe51e8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Mar 2022 07:42:13 +0000 Subject: [PATCH 3/3] Bump com.apollographql.apollo3 from 3.1.0 to 3.2.0 (#697) * Bump com.apollographql.apollo3 from 3.1.0 to 3.2.0 Bumps [com.apollographql.apollo3](https://github.com/apollographql/apollo-android) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/apollographql/apollo-android/releases) - [Changelog](https://github.com/apollographql/apollo-kotlin/blob/main/CHANGELOG.md) - [Commits](https://github.com/apollographql/apollo-android/compare/v3.1.0...v3.2.0) --- updated-dependencies: - dependency-name: com.apollographql.apollo3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update gradle.properties Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Brandon Fergerson --- gradle.properties | 2 +- settings.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6c43a6b45..85dd6a03b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ platformPlugins = java, Groovy, Kotlin, PythonCore:213.5744.223, org.intellij.sc # See https://kotlinlang.org/docs/reference/using-gradle.html#dependency-on-the-standard-library for details. kotlin.stdlib.default.dependency = true -apolloVersion=3.1.0 +apolloVersion=3.2.0 vertxVersion=4.2.4 slf4jVersion=1.7.33 jacksonVersion=2.13.1 diff --git a/settings.gradle b/settings.gradle index 49f93c109..a01d3bcc3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,7 +7,7 @@ pluginManagement { id 'org.jetbrains.kotlin.plugin.serialization' version kotlinVersion apply false id 'com.avast.gradle.docker-compose' version "0.15.2" apply false id 'io.gitlab.arturbosch.detekt' version "1.19.0" apply false - id 'com.apollographql.apollo3' version "3.1.0" apply false + id 'com.apollographql.apollo3' version "3.2.0" apply false id 'com.diffplug.spotless' version '6.4.0' apply false } }