Merge 91a8611 into 19b73fa

agorapulse · Oct 12, 2022 · f5537c4 · f5537c4
2 parents 19b73fa + 91a8611
commit f5537c4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -26,7 +26,7 @@ micronautVersion = 1.3.7
 nexusPluginVersion = 1.0.0
 gitPublishVersion = 2.1.3
 
-segmentLibrariesVersion = 2.1.1
+segmentLibrariesVersion = 3.3.1
 
 groovySupportVersion = 0.6.3
 spockVersion=2.0-groovy-2.5
diff --git a/libs/micronaut-segment/src/main/java/com/agorapulse/micronaut/segment/SegmentFactory.java b/libs/micronaut-segment/src/main/java/com/agorapulse/micronaut/segment/SegmentFactory.java
@@ -18,14 +18,16 @@
 package com.agorapulse.micronaut.segment;
 
 import com.agorapulse.micronaut.segment.util.Slf4jSegmentLog;
-import com.jakewharton.retrofit.Ok3Client;
-import com.segment.analytics.*;
+import com.segment.analytics.Analytics;
+import com.segment.analytics.Callback;
+import com.segment.analytics.MessageInterceptor;
+import com.segment.analytics.MessageTransformer;
 import io.micronaut.context.annotation.Bean;
 import io.micronaut.context.annotation.Factory;
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.env.Environment;
 import okhttp3.OkHttpClient;
-import retrofit.client.Client;
+
 
 import javax.annotation.Nullable;
 import javax.inject.Named;
@@ -51,7 +53,7 @@ public Analytics analytics(
         List<MessageInterceptor> messageInterceptor,
         List<MessageTransformer> messageTransformers,
         List<Callback> callbacks,
-        @Named("segment") Client client,
+        @Named("segment") OkHttpClient client,
         @Named("segment") ThreadFactory threadFactory,
         @Named("segmentNetworkExecutor") ExecutorService segmentNetworkExecutor
     ) {
@@ -89,13 +91,12 @@ public SegmentService segmentService(
     @Singleton
     @Named("segment")
     @Requires(beans = SegmentConfiguration.class)
-    Client defaultClient() {
-        OkHttpClient client = new OkHttpClient.Builder()
+    OkHttpClient defaultClient() {
+        return new OkHttpClient.Builder()
             .connectTimeout(15, TimeUnit.SECONDS)
             .readTimeout(15, TimeUnit.SECONDS)
             .writeTimeout(15, TimeUnit.SECONDS)
             .build();
-        return new Ok3Client(client);
     }
 
     @Bean