Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion marker/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion marker/jvm-marker/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion marker/py-marker/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion monitor/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down