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() {