build(Gradle): Switch to the official KxS converter for Retrofit

See [1]. [1]: https://github.com/square/retrofit/releases/tag/2.10.0 Signed-off-by: Sebastian Schuberth <[email protected]>
oss-review-toolkit · Mar 19, 2024 · d3b9340 · d3b9340
1 parent dbbaac8
commit d3b9340
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 14 deletions.
diff --git a/clients/clearly-defined/src/main/kotlin/ClearlyDefinedService.kt b/clients/clearly-defined/src/main/kotlin/ClearlyDefinedService.kt
@@ -19,8 +19,6 @@
 
 package org.ossreviewtoolkit.clients.clearlydefined
 
-import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
-
 import java.io.IOException
 
 import kotlinx.coroutines.Dispatchers
@@ -37,6 +35,7 @@ import okhttp3.ResponseBody
 
 import retrofit2.HttpException
 import retrofit2.Retrofit
+import retrofit2.converter.kotlinx.serialization.asConverterFactory
 import retrofit2.converter.scalars.ScalarsConverterFactory
 import retrofit2.http.Body
 import retrofit2.http.GET

diff --git a/clients/nexus-iq/src/main/kotlin/NexusIqService.kt b/clients/nexus-iq/src/main/kotlin/NexusIqService.kt
@@ -19,8 +19,6 @@
 
 package org.ossreviewtoolkit.clients.nexusiq
 
-import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
-
 import io.ks3.java.typealiases.UriAsString
 
 import java.util.UUID
@@ -33,6 +31,7 @@ import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 
 import retrofit2.Retrofit
+import retrofit2.converter.kotlinx.serialization.asConverterFactory
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST

diff --git a/clients/oss-index/src/main/kotlin/OssIndexService.kt b/clients/oss-index/src/main/kotlin/OssIndexService.kt
@@ -19,8 +19,6 @@
 
 package org.ossreviewtoolkit.clients.ossindex
 
-import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
-
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 
@@ -29,6 +27,7 @@ import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 
 import retrofit2.Retrofit
+import retrofit2.converter.kotlinx.serialization.asConverterFactory
 import retrofit2.http.Body
 import retrofit2.http.POST
 

diff --git a/clients/osv/src/main/kotlin/OsvApiClient.kt b/clients/osv/src/main/kotlin/OsvApiClient.kt
@@ -19,8 +19,6 @@
 
 package org.ossreviewtoolkit.clients.osv
 
-import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
-
 import io.ks3.java.typealiases.InstantAsString
 
 import java.util.concurrent.Executors
@@ -36,6 +34,7 @@ import okhttp3.OkHttpClient
 
 import retrofit2.Call
 import retrofit2.Retrofit
+import retrofit2.converter.kotlinx.serialization.asConverterFactory
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST

diff --git a/clients/scanoss/src/main/kotlin/ScanOssService.kt b/clients/scanoss/src/main/kotlin/ScanOssService.kt
@@ -19,8 +19,6 @@
 
 package org.ossreviewtoolkit.clients.scanoss
 
-import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
-
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonNamingStrategy
 
@@ -31,6 +29,7 @@ import okhttp3.OkHttpClient
 import org.ossreviewtoolkit.clients.scanoss.model.ScanResponse
 
 import retrofit2.Retrofit
+import retrofit2.converter.kotlinx.serialization.asConverterFactory
 import retrofit2.http.Multipart
 import retrofit2.http.POST
 import retrofit2.http.Part

diff --git a/clients/vulnerable-code/src/main/kotlin/VulnerableCodeService.kt b/clients/vulnerable-code/src/main/kotlin/VulnerableCodeService.kt
@@ -19,8 +19,6 @@
 
 package org.ossreviewtoolkit.clients.vulnerablecode
 
-import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
-
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonNames
@@ -30,6 +28,7 @@ import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 
 import retrofit2.Retrofit
+import retrofit2.converter.kotlinx.serialization.asConverterFactory
 import retrofit2.http.Body
 import retrofit2.http.POST
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -51,7 +51,6 @@ postgres = "42.7.3"
 postgresEmbedded = "1.0.2"
 reflections = "0.10.2"
 retrofit = "2.10.0"
-retrofitConverterKotlinxSerialization = "1.0.0"
 s3 = "2.25.0"
 saxonHe = "12.4"
 scanoss = "1.1.6"
@@ -156,7 +155,7 @@ postgresEmbedded = { module = "com.opentable.components:otj-pg-embedded", versio
 reflections = { module = "org.reflections:reflections", version.ref = "reflections" }
 retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-converter-jackson = { module = "com.squareup.retrofit2:converter-jackson", version.ref = "retrofit" }
-retrofit-converter-kotlinxSerialization = { module = "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter", version.ref = "retrofitConverterKotlinxSerialization" }
+retrofit-converter-kotlinxSerialization = { module = "com.squareup.retrofit2:converter-kotlinx-serialization", version.ref = "retrofit" }
 retrofit-converter-scalars = { module = "com.squareup.retrofit2:converter-scalars", version.ref = "retrofit" }
 saxonHe = { module = "net.sf.saxon:Saxon-HE", version.ref = "saxonHe" }
 scanoss = { module = "com.scanoss:scanner", version.ref = "scanoss" }