diff --git a/.github/media/SM.png b/.github/media/SM.png deleted file mode 100644 index b05135e3c..000000000 Binary files a/.github/media/SM.png and /dev/null differ diff --git a/.github/media/SM.svg b/.github/media/SM.svg deleted file mode 100644 index a91f0aab7..000000000 --- a/.github/media/SM.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/.github/media/misc/SM-CFD_Software.jpg b/.github/media/misc/SM-CFD_Software.jpg deleted file mode 100644 index 1102aabb9..000000000 Binary files a/.github/media/misc/SM-CFD_Software.jpg and /dev/null differ diff --git a/.github/media/misc/SM-Research-vs-Development.jpg b/.github/media/misc/SM-Research-vs-Development.jpg deleted file mode 100644 index 960373924..000000000 Binary files a/.github/media/misc/SM-Research-vs-Development.jpg and /dev/null differ diff --git a/.github/media/misc/SM-v0.2.1-Screencast.gif b/.github/media/misc/SM-v0.2.1-Screencast.gif deleted file mode 100644 index 8b41d60fc..000000000 Binary files a/.github/media/misc/SM-v0.2.1-Screencast.gif and /dev/null differ diff --git a/.github/media/misc/SM_Alerting.gif b/.github/media/misc/SM_Alerting.gif deleted file mode 100644 index 94d7e9f2a..000000000 Binary files a/.github/media/misc/SM_Alerting.gif and /dev/null differ diff --git a/.github/media/misc/SM_IDE-APM.gif b/.github/media/misc/SM_IDE-APM.gif deleted file mode 100644 index 1be9dbbe6..000000000 Binary files a/.github/media/misc/SM_IDE-APM.gif and /dev/null differ diff --git a/.github/media/misc/SM_Logging.gif b/.github/media/misc/SM_Logging.gif deleted file mode 100644 index 9bf719b77..000000000 Binary files a/.github/media/misc/SM_Logging.gif and /dev/null differ diff --git a/.github/media/misc/SM_Tracing.gif b/.github/media/misc/SM_Tracing.gif deleted file mode 100644 index 0a094c76c..000000000 Binary files a/.github/media/misc/SM_Tracing.gif and /dev/null differ diff --git a/.github/media/misc/Scientific_Research.png b/.github/media/misc/Scientific_Research.png deleted file mode 100644 index b763c5811..000000000 Binary files a/.github/media/misc/Scientific_Research.png and /dev/null differ diff --git a/.github/media/misc/Software_Development.png b/.github/media/misc/Software_Development.png deleted file mode 100644 index a1bcec73a..000000000 Binary files a/.github/media/misc/Software_Development.png and /dev/null differ diff --git a/.github/media/portal_overview.png b/.github/media/portal_overview.png deleted file mode 100644 index 28464c06c..000000000 Binary files a/.github/media/portal_overview.png and /dev/null differ diff --git a/.github/media/screencasts/Peek 2021-02-10 12-39.gif b/.github/media/screencasts/Peek 2021-02-10 12-39.gif deleted file mode 100644 index ca40700ce..000000000 Binary files a/.github/media/screencasts/Peek 2021-02-10 12-39.gif and /dev/null differ diff --git a/.github/media/screenshots/activity.png b/.github/media/screenshots/activity.png deleted file mode 100755 index f10caa0ad..000000000 Binary files a/.github/media/screenshots/activity.png and /dev/null differ diff --git a/.github/media/screenshots/activity_view.gif b/.github/media/screenshots/activity_view.gif deleted file mode 100755 index de78b0a7e..000000000 Binary files a/.github/media/screenshots/activity_view.gif and /dev/null differ diff --git a/.github/media/screenshots/latest_traces.gif b/.github/media/screenshots/latest_traces.gif deleted file mode 100644 index 5a9ea74f5..000000000 Binary files a/.github/media/screenshots/latest_traces.gif and /dev/null differ diff --git a/.github/media/screenshots/logging.gif b/.github/media/screenshots/logging.gif deleted file mode 100644 index ca803030d..000000000 Binary files a/.github/media/screenshots/logging.gif and /dev/null differ diff --git a/.github/media/screenshots/open_activity.gif b/.github/media/screenshots/open_activity.gif deleted file mode 100755 index 3798c8299..000000000 Binary files a/.github/media/screenshots/open_activity.gif and /dev/null differ diff --git a/.github/media/screenshots/overview.gif b/.github/media/screenshots/overview.gif deleted file mode 100755 index edad2fdf0..000000000 Binary files a/.github/media/screenshots/overview.gif and /dev/null differ diff --git a/.github/media/screenshots/performance_ramp.png b/.github/media/screenshots/performance_ramp.png deleted file mode 100755 index 6615b0684..000000000 Binary files a/.github/media/screenshots/performance_ramp.png and /dev/null differ diff --git a/.github/media/screenshots/plugin_configuration.png b/.github/media/screenshots/plugin_configuration.png deleted file mode 100644 index 667951799..000000000 Binary files a/.github/media/screenshots/plugin_configuration.png and /dev/null differ diff --git a/.github/media/screenshots/slowest_traces.gif b/.github/media/screenshots/slowest_traces.gif deleted file mode 100755 index adc8280ec..000000000 Binary files a/.github/media/screenshots/slowest_traces.gif and /dev/null differ diff --git a/.github/media/screenshots/span_info.gif b/.github/media/screenshots/span_info.gif deleted file mode 100755 index 049f5e331..000000000 Binary files a/.github/media/screenshots/span_info.gif and /dev/null differ diff --git a/.github/media/screenshots/trace_stack.png b/.github/media/screenshots/trace_stack.png deleted file mode 100644 index 2e3792329..000000000 Binary files a/.github/media/screenshots/trace_stack.png and /dev/null differ diff --git a/.github/media/screenshots/traces_view.gif b/.github/media/screenshots/traces_view.gif deleted file mode 100755 index c1b790278..000000000 Binary files a/.github/media/screenshots/traces_view.gif and /dev/null differ diff --git a/.github/media/screenshots/track.gif b/.github/media/screenshots/track.gif deleted file mode 100755 index 881530604..000000000 Binary files a/.github/media/screenshots/track.gif and /dev/null differ diff --git a/.github/media/screenshots/track_sioobe.gif b/.github/media/screenshots/track_sioobe.gif deleted file mode 100755 index d00383012..000000000 Binary files a/.github/media/screenshots/track_sioobe.gif and /dev/null differ diff --git a/build.gradle.kts b/build.gradle.kts index f36883ca7..1b6f2d6b7 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-0.4.4.jar") + val f = File(projectDir, "test/e2e/spp-probe-$projectVersion.jar") if (!f.exists()) { println("Downloading Source++ JVM probe") - java.net.URL("https://github.com/sourceplusplus/probe-jvm/releases/download/0.4.4/spp-probe-0.4.4.jar") + java.net.URL("https://github.com/sourceplusplus/probe-jvm/releases/download/$projectVersion/spp-probe-$projectVersion.jar") .openStream().use { input -> java.io.FileOutputStream(f).use { output -> input.copyTo(output) diff --git a/marker/build.gradle.kts b/marker/build.gradle.kts index bbf72460e..b72d62368 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:0.4.4") + compileOnly("com.github.sourceplusplus.protocol:protocol:$projectVersion") 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 e15433649..86ddb179b 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:0.4.4") + compileOnly("com.github.sourceplusplus.protocol:protocol:$projectVersion") 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 3f1da3eae..6c8bd66a3 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:0.4.4") + compileOnly("com.github.sourceplusplus.protocol:protocol:$projectVersion") 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 b7d933cac..5b090150c 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:0.4.4") + implementation("com.github.sourceplusplus.protocol:protocol:$projectVersion") 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 b881cabf8..b44f40e33 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:0.4.4") { isTransitive = false } - implementation("com.github.sourceplusplus.protocol:protocol:0.4.4") + implementation("com.github.sourceplusplus.interface-portal:portal-jvm:$projectVersion") { isTransitive = false } + implementation("com.github.sourceplusplus.protocol:protocol:$projectVersion") } implementation("org.jooq:joor:$joorVersion") @@ -115,12 +115,17 @@ tasks { // Get the latest available change notes from the changelog file changeNotes.set(project.provider { - val changelog = URL("https://raw.githubusercontent.com/sourceplusplus/live-platform/master/CHANGELOG.md") + val pluginChangesHeader = "### [JetBrains Plugin](https://github.com/sourceplusplus/interface-jetbrains)\n" + val fullChangelog = URL("https://raw.githubusercontent.com/sourceplusplus/documentation/master/docs/changelog/README.md") .readText() - .substringAfter("### [JetBrains Plugin](https://github.com/sourceplusplus/interface-jetbrains)\n") - .substringBefore("\n### ").substringBefore("\n## ") - .trim() - markdownToHTML(changelog) + if (fullChangelog.contains(pluginChangesHeader)) { + val changelog = fullChangelog.substringAfter(pluginChangesHeader) + .substringBefore("\n### ").substringBefore("\n## ") + .trim() + markdownToHTML(changelog) + } else { + markdownToHTML("") + } }) } @@ -136,12 +141,15 @@ tasks { tasks { register("getPluginChangelog") { doFirst { - val changelog = URL("https://raw.githubusercontent.com/sourceplusplus/live-platform/master/CHANGELOG.md") + val pluginChangesHeader = "### [JetBrains Plugin](https://github.com/sourceplusplus/interface-jetbrains)\n" + val fullChangelog = URL("https://raw.githubusercontent.com/sourceplusplus/documentation/master/docs/changelog/README.md") .readText() - .substringAfter("### [JetBrains Plugin](https://github.com/sourceplusplus/interface-jetbrains)\n") - .substringBefore("\n### ").substringBefore("\n## ") - .trim() - println(changelog) + if (fullChangelog.contains(pluginChangesHeader)) { + val changelog = fullChangelog.substringAfter(pluginChangesHeader) + .substringBefore("\n### ").substringBefore("\n## ") + .trim() + println(changelog) + } } } 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 4951fe8c2..15ff6525a 100644 --- a/plugin/src/main/java/spp/jetbrains/sourcemarker/settings/PluginConfigurationPanel.java +++ b/plugin/src/main/java/spp/jetbrains/sourcemarker/settings/PluginConfigurationPanel.java @@ -46,7 +46,6 @@ public PluginConfigurationPanel(SourceMarkerConfig config) { myServiceSettingsPanel.setBorder(IdeBorderFactory.createTitledBorder(message("service_settings"))); myGlobalSettingsPanel.setBorder(IdeBorderFactory.createTitledBorder(message("plugin_settings"))); - //todo: properly ensure live service can never be null if (INSTANCE.getLiveService() != null) { INSTANCE.getLiveService().getServices().onComplete(it -> { if (it.succeeded()) {