Skip to content

Commit bd904d3

Browse files
sbouchetadietish
authored andcommitted
chore: fix latest IJ / IC 2025.1
Signed-off-by: Stephane Bouchet <[email protected]>
1 parent 49852a4 commit bd904d3

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed

build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ dependencies {
5353

5454
pluginVerifier()
5555

56-
instrumentationTools()
57-
5856
testFramework(TestFrameworkType.Platform)
5957
}
6058

gradle.properties

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ jetBrainsToken=invalid
33
jetBrainsChannel=stable
44

55
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
6-
# if plugin uses intellij-common-ui-test library, 'platformType' and 'platformVersion' variables names MUST be used
76
# platformType = IC (not needed as hard-coded in gradle build directly)
8-
platformVersion=2023.1
7+
platformVersion=2023.4
98

109
# Gradle Releases -> https://github.com/gradle/gradle/releases
1110
gradleVersion=8.5
1211

1312
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
14-
platformBundledPlugins=org.jetbrains.plugins.yaml
13+
platformBundledPlugins=org.jetbrains.plugins.yaml, org.jetbrains.plugins.terminal, com.intellij.modules.json
1514
platformPlugins=com.redhat.devtools.intellij.telemetry:1.2.0.59
1615

1716
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ commons-lang3 = "3.12.0"
77
assertj-core = "3.22.0"
88
mockito = "5.12.0"
99
mockito-kotlin = "2.2.0"
10-
devtools-common-ui-test = "0.4.2"
11-
junit-platform = "1.10.3"
12-
junit-jupiter = "5.10.3"
10+
devtools-common-ui-test = "0.4.3"
11+
junit-platform = "1.11.3"
12+
junit-jupiter = "5.11.3"
1313
gson = "2.8.9"
1414

1515
# plugins
16-
gradleIntelliJPlugin = "2.1.0"
16+
gradleIntelliJPlugin = "2.2.1"
1717
kotlinJvm = "2.0.20"
1818

1919
[libraries]

src/main/kotlin/com/redhat/devtools/intellij/kubernetes/telemetry/TelemetryService.kt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
******************************************************************************/
1111
package com.redhat.devtools.intellij.kubernetes.telemetry
1212

13+
import com.intellij.ide.plugins.PluginManager
14+
import com.intellij.openapi.application.ApplicationManager
15+
import com.intellij.openapi.extensions.DefaultPluginDescriptor
1316
import com.redhat.devtools.intellij.common.validation.KubernetesResourceInfo
1417
import com.redhat.devtools.intellij.common.validation.KubernetesTypeInfo
1518
import com.redhat.devtools.intellij.kubernetes.model.resource.ResourceKind
@@ -29,7 +32,15 @@ object TelemetryService {
2932
const val PROP_OPENSHIFT_VERSION = "openshift_version"
3033

3134
val instance: TelemetryMessageBuilder by lazy {
32-
TelemetryMessageBuilder(TelemetryService::class.java.classLoader)
35+
return@lazy if (!ApplicationManager.getApplication().isUnitTestMode) {
36+
TelemetryMessageBuilder(
37+
PluginManager.getPluginByClass(this.javaClass)
38+
)
39+
} else {
40+
TelemetryMessageBuilder(
41+
DefaultPluginDescriptor("")
42+
)
43+
}
3344
}
3445

3546
fun sendTelemetry(resources: Collection<HasMetadata>, telemetry: TelemetryMessageBuilder.ActionMessage) {

0 commit comments

Comments
 (0)