Skip to content

Commit 48ecb91

Browse files
committed
Merge branch 'main' into fix/digma-overload-warning
2 parents 49bc8a2 + 5fa3805 commit 48ecb91

File tree

30 files changed

+282
-423
lines changed

30 files changed

+282
-423
lines changed

buildSrc/src/main/kotlin/common/BuildProfile.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ object BuildProfiles {
180180

181181
profile = Profiles.p241,
182182
platformVersion = "2024.1",
183-
riderVersion = "2024.1-EAP9-SNAPSHOT",
183+
riderVersion = "2024.1",
184184
pycharmVersion = "2024.1",
185-
riderResharperVersion = "2024.1-eap09",
185+
riderResharperVersion = "2024.1.0",
186186
riderResharperVersionConstant = "PROFILE_2023_2",
187187
pythonPluginVersion = "241.14494.240",
188188
platformVersionCode = "241",
@@ -201,9 +201,9 @@ object BuildProfiles {
201201
isEAP = true,
202202
profile = Profiles.p242,
203203
platformVersion = "2024.1",
204-
riderVersion = "2024.1-EAP9-SNAPSHOT",
204+
riderVersion = "2024.1",
205205
pycharmVersion = "2024.1",
206-
riderResharperVersion = "2024.1-eap09",
206+
riderResharperVersion = "2024.1.0",
207207
riderResharperVersionConstant = "PROFILE_2023_2",
208208
pythonPluginVersion = "241.14494.240",
209209
platformVersionCode = "241",

ide-common/src/main/java/org/digma/intellij/plugin/common/StartupStartupActivity.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
import com.intellij.ide.util.RunOnceUtil;
44
import com.intellij.openapi.project.*;
55
import com.intellij.openapi.startup.StartupActivity;
6-
import org.digma.intellij.plugin.posthog.*;
6+
import org.digma.intellij.plugin.posthog.ActivityMonitor;
7+
import org.digma.intellij.plugin.session.SessionMetadataProperties;
78
import org.digma.intellij.plugin.ui.ToolWindowShower;
89
import org.jetbrains.annotations.NotNull;
910

10-
import static org.digma.intellij.plugin.posthog.SessionMetadataKt.getPluginLoadedKey;
11+
import static org.digma.intellij.plugin.session.SessionMetadataPropertiesKt.getPluginLoadedKey;
1112

1213
public class StartupStartupActivity implements StartupActivity.DumbAware {
1314

@@ -20,6 +21,6 @@ public void runActivity(@NotNull Project project) {
2021
project.getService(DumbService.class).runWhenSmart(() -> EDT.ensureEDT(() -> ToolWindowShower.getInstance(project).showToolWindow()));
2122
});
2223
ActivityMonitor.getInstance(project).registerPluginLoaded();
23-
SessionMetadata.getInstance().put(getPluginLoadedKey(project), true);
24+
SessionMetadataProperties.getInstance().put(getPluginLoadedKey(project), true);
2425
}
2526
}

ide-common/src/main/kotlin/org/digma/intellij/plugin/persistence/PersistenceData.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ internal data class PersistenceData(
9191
var loadWarningAppearedTimestamp: Instant? = null,
9292

9393
var isFinishDigmathonGameForUser: Boolean = false,
94-
var digmathonViewedInsights: String? = null
94+
var digmathonViewedInsights: String? = null,
95+
9596

9697
)

0 commit comments

Comments
 (0)