Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Mar 19, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions clients/clearly-defined/src/main/kotlin/ClearlyDefinedService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions clients/nexus-iq/src/main/kotlin/NexusIqService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions clients/oss-index/src/main/kotlin/OssIndexService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
3 changes: 1 addition & 2 deletions clients/osv/src/main/kotlin/OsvApiClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions clients/scanoss/src/main/kotlin/ScanOssService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions clients/vulnerable-code/src/main/kotlin/VulnerableCodeService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
3 changes: 1 addition & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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" }
Expand Down
Loading