Skip to content

Commit bb87107

Browse files
fbriconadietish
authored andcommitted
build: update segment-java to 3.4.0 and gson to 2.10.1
Signed-off-by: Fred Bricon <[email protected]>
1 parent 117454f commit bb87107

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

build.gradle

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,16 @@ publishPlugin {
3232
}
3333

3434
dependencies {
35+
implementation('com.segment.analytics.java:analytics:3.4.0') {
36+
exclude group: 'org.jetbrains.kotlin'
37+
exclude group: 'com.squareup.retrofit2', module: 'retrofit-mock'
38+
exclude group: 'com.google.auto.value', module: 'auto-value-annotations'
39+
}
40+
implementation('com.squareup.okio:okio:3.6.0') {
41+
exclude group: 'org.jetbrains.kotlin'
42+
}
3543
implementation(
36-
'com.segment.analytics.java:analytics:2.1.1',
37-
'com.squareup.okhttp3:okhttp:4.9.3'
44+
'com.google.code.gson:gson:2.10.1'
3845
)
3946
testImplementation(
4047
"org.junit.jupiter:junit-jupiter:5.9.1",

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ jetBrainsToken=invalid
88
jetBrainsChannel=stable
99
nexusUser=invalid
1010
nexusPassword=invalid
11+
12+
# https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
13+
kotlin.stdlib.default.dependency=false

src/test/java/com/redhat/devtools/intellij/telemetry/core/service/TelemetryMessageBuilderIntegrationTest.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
package com.redhat.devtools.intellij.telemetry.core.service;
1212

1313
import com.intellij.util.messages.MessageBusConnection;
14-
import com.jakewharton.retrofit.Ok3Client;
1514
import com.redhat.devtools.intellij.telemetry.core.IService;
1615
import com.redhat.devtools.intellij.telemetry.core.configuration.TelemetryConfiguration;
1716
import com.redhat.devtools.intellij.telemetry.core.service.segment.ISegmentConfiguration;
@@ -26,7 +25,6 @@
2625
import org.junit.jupiter.api.BeforeEach;
2726
import org.junit.jupiter.api.Disabled;
2827
import org.junit.jupiter.api.Test;
29-
import retrofit.client.Client;
3028

3129
import java.util.concurrent.TimeUnit;
3230

@@ -123,7 +121,7 @@ void should_send_feedback() {
123121
// then
124122
}
125123

126-
private Analytics createAnalytics(BlockingFlush blockingFlush, Client client) {
124+
private Analytics createAnalytics(BlockingFlush blockingFlush, OkHttpClient client) {
127125
return Analytics.builder(SEGMENT_WRITE_KEY)
128126
.flushQueueSize(1)
129127
.plugin(new StdOutLogging())
@@ -132,19 +130,17 @@ private Analytics createAnalytics(BlockingFlush blockingFlush, Client client) {
132130
.build();
133131
}
134132

135-
private Client createClient() {
136-
return new Ok3Client(
137-
new OkHttpClient.Builder()
138-
.connectTimeout(5, TimeUnit.SECONDS)
139-
.readTimeout(5, TimeUnit.SECONDS)
140-
.writeTimeout(5, TimeUnit.SECONDS)
141-
.build());
133+
private OkHttpClient createClient() {
134+
return new OkHttpClient.Builder()
135+
.connectTimeout(5, TimeUnit.SECONDS)
136+
.readTimeout(5, TimeUnit.SECONDS)
137+
.writeTimeout(5, TimeUnit.SECONDS)
138+
.build();
142139
}
143140

144141
private void shutdownAnalytics() {
145142
analytics.flush();
146143
blockingFlush.block();
147144
analytics.shutdown();
148145
}
149-
150146
}

0 commit comments

Comments
 (0)