Skip to content

Commit dde3367

Browse files
authored
v0.4.5 (#703)
* archive media * should be only place that needs null check * revert to dynamic * fixes #701 * use readme for unreleased
1 parent 9875e00 commit dde3367

34 files changed

+26
-20
lines changed

.github/media/SM.png

-51.2 KB
Binary file not shown.

.github/media/SM.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.
-141 KB
Binary file not shown.
Binary file not shown.
-6.2 MB
Binary file not shown.

.github/media/misc/SM_Alerting.gif

-2.93 MB
Binary file not shown.

.github/media/misc/SM_IDE-APM.gif

-1.1 MB
Binary file not shown.

.github/media/misc/SM_Logging.gif

-3.58 MB
Binary file not shown.

.github/media/misc/SM_Tracing.gif

-1.02 MB
Binary file not shown.
-23.3 KB
Binary file not shown.
-26.2 KB
Binary file not shown.

.github/media/portal_overview.png

-1010 KB
Binary file not shown.
Binary file not shown.
-129 KB
Binary file not shown.
-99.4 KB
Binary file not shown.
-138 KB
Binary file not shown.

.github/media/screenshots/logging.gif

-176 KB
Binary file not shown.
-120 KB
Binary file not shown.
-40.1 KB
Binary file not shown.
-21.8 KB
Binary file not shown.
Binary file not shown.
-44.4 KB
Binary file not shown.
-39.3 KB
Binary file not shown.
-175 KB
Binary file not shown.
-541 KB
Binary file not shown.

.github/media/screenshots/track.gif

-16.5 KB
Binary file not shown.
-13.5 KB
Binary file not shown.

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ subprojects {
8383
tasks {
8484
register("downloadProbe") {
8585
doLast {
86-
val f = File(projectDir, "test/e2e/spp-probe-0.4.4.jar")
86+
val f = File(projectDir, "test/e2e/spp-probe-$projectVersion.jar")
8787
if (!f.exists()) {
8888
println("Downloading Source++ JVM probe")
89-
java.net.URL("https://github.com/sourceplusplus/probe-jvm/releases/download/0.4.4/spp-probe-0.4.4.jar")
89+
java.net.URL("https://github.com/sourceplusplus/probe-jvm/releases/download/$projectVersion/spp-probe-$projectVersion.jar")
9090
.openStream().use { input ->
9191
java.io.FileOutputStream(f).use { output ->
9292
input.copyTo(output)

marker/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies {
3030
val intellijVersion = "213.7172.25"
3131

3232
compileOnly("org.jooq:joor:$joorVersion")
33-
compileOnly("com.github.sourceplusplus.protocol:protocol:0.4.4")
33+
compileOnly("com.github.sourceplusplus.protocol:protocol:$projectVersion")
3434
compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinVersion")
3535
compileOnly("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
3636
compileOnly("com.google.guava:guava:31.1-jre")

marker/jvm-marker/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
compileOnly(project(":marker"))
2222
compileOnly(project(":monitor"))
2323
}
24-
compileOnly("com.github.sourceplusplus.protocol:protocol:0.4.4")
24+
compileOnly("com.github.sourceplusplus.protocol:protocol:$projectVersion")
2525
val intellijVersion = "213.7172.25"
2626

2727
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinVersion")

marker/py-marker/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies {
1818
} else {
1919
compileOnly(project(":marker"))
2020
}
21-
compileOnly("com.github.sourceplusplus.protocol:protocol:0.4.4")
21+
compileOnly("com.github.sourceplusplus.protocol:protocol:$projectVersion")
2222
val intellijVersion = "213.7172.25"
2323

2424
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinVersion")

monitor/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ val projectVersion: String by project
1010
val slf4jVersion: String by project
1111

1212
dependencies {
13-
implementation("com.github.sourceplusplus.protocol:protocol:0.4.4")
13+
implementation("com.github.sourceplusplus.protocol:protocol:$projectVersion")
1414
implementation("org.slf4j:slf4j-api:$slf4jVersion")
1515
implementation("com.apollographql.apollo3:apollo-runtime:$apolloVersion")
1616
api("com.apollographql.apollo3:apollo-api:$apolloVersion")

plugin/build.gradle.kts

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ dependencies {
6161
implementation(project(":marker:jvm-marker"))
6262
implementation(project(":marker:py-marker"))
6363
implementation(project(":monitor"))
64-
implementation("com.github.sourceplusplus.interface-portal:portal-jvm:0.4.4") { isTransitive = false }
65-
implementation("com.github.sourceplusplus.protocol:protocol:0.4.4")
64+
implementation("com.github.sourceplusplus.interface-portal:portal-jvm:$projectVersion") { isTransitive = false }
65+
implementation("com.github.sourceplusplus.protocol:protocol:$projectVersion")
6666
}
6767

6868
implementation("org.jooq:joor:$joorVersion")
@@ -115,12 +115,17 @@ tasks {
115115

116116
// Get the latest available change notes from the changelog file
117117
changeNotes.set(project.provider {
118-
val changelog = URL("https://raw.githubusercontent.com/sourceplusplus/live-platform/master/CHANGELOG.md")
118+
val pluginChangesHeader = "### [JetBrains Plugin](https://github.com/sourceplusplus/interface-jetbrains)\n"
119+
val fullChangelog = URL("https://raw.githubusercontent.com/sourceplusplus/documentation/master/docs/changelog/README.md")
119120
.readText()
120-
.substringAfter("### [JetBrains Plugin](https://github.com/sourceplusplus/interface-jetbrains)\n")
121-
.substringBefore("\n### ").substringBefore("\n## ")
122-
.trim()
123-
markdownToHTML(changelog)
121+
if (fullChangelog.contains(pluginChangesHeader)) {
122+
val changelog = fullChangelog.substringAfter(pluginChangesHeader)
123+
.substringBefore("\n### ").substringBefore("\n## ")
124+
.trim()
125+
markdownToHTML(changelog)
126+
} else {
127+
markdownToHTML("")
128+
}
124129
})
125130
}
126131

@@ -136,12 +141,15 @@ tasks {
136141
tasks {
137142
register("getPluginChangelog") {
138143
doFirst {
139-
val changelog = URL("https://raw.githubusercontent.com/sourceplusplus/live-platform/master/CHANGELOG.md")
144+
val pluginChangesHeader = "### [JetBrains Plugin](https://github.com/sourceplusplus/interface-jetbrains)\n"
145+
val fullChangelog = URL("https://raw.githubusercontent.com/sourceplusplus/documentation/master/docs/changelog/README.md")
140146
.readText()
141-
.substringAfter("### [JetBrains Plugin](https://github.com/sourceplusplus/interface-jetbrains)\n")
142-
.substringBefore("\n### ").substringBefore("\n## ")
143-
.trim()
144-
println(changelog)
147+
if (fullChangelog.contains(pluginChangesHeader)) {
148+
val changelog = fullChangelog.substringAfter(pluginChangesHeader)
149+
.substringBefore("\n### ").substringBefore("\n## ")
150+
.trim()
151+
println(changelog)
152+
}
145153
}
146154
}
147155

plugin/src/main/java/spp/jetbrains/sourcemarker/settings/PluginConfigurationPanel.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public PluginConfigurationPanel(SourceMarkerConfig config) {
4646
myServiceSettingsPanel.setBorder(IdeBorderFactory.createTitledBorder(message("service_settings")));
4747
myGlobalSettingsPanel.setBorder(IdeBorderFactory.createTitledBorder(message("plugin_settings")));
4848

49-
//todo: properly ensure live service can never be null
5049
if (INSTANCE.getLiveService() != null) {
5150
INSTANCE.getLiveService().getServices().onComplete(it -> {
5251
if (it.succeeded()) {

0 commit comments

Comments
 (0)