Skip to content

Commit 2a15270

Browse files
authored
[KOTLIN] Kotlinx serialization, use first party retrofit converter factory (#18656)
* Switch the jakewharton converter factory for the first party one * Run all samples generation
1 parent b23dcbd commit 2a15270

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ dependencies {
191191
implementation "com.squareup.retrofit2:converter-moshi:$retrofitVersion"
192192
{{/moshi}}
193193
{{#kotlinx_serialization}}
194-
implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0"
194+
implementation "com.squareup.retrofit2:converter-kotlinx-serialization:$retrofitVersion"
195195
{{/kotlinx_serialization}}
196196
{{#jackson}}
197197
implementation "com.squareup.retrofit2:converter-jackson:$retrofitVersion"

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ import retrofit2.converter.jackson.JacksonConverterFactory
5555
{{/jackson}}
5656

5757
{{#kotlinx_serialization}}
58-
import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
58+
import retrofit2.converter.kotlinx.serialization.asConverterFactory
5959
import {{packageName}}.infrastructure.Serializer.kotlinxSerializationJson
6060
import okhttp3.MediaType.Companion.toMediaType
6161
{{/kotlinx_serialization}}

samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ dependencies {
6161
implementation "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.2"
6262
implementation "com.squareup.okhttp3:logging-interceptor:4.12.0"
6363
implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
64-
implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0"
64+
implementation "com.squareup.retrofit2:converter-kotlinx-serialization:$retrofitVersion"
6565
implementation "com.squareup.retrofit2:converter-scalars:$retrofitVersion"
6666
testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
6767
}

samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import retrofit2.Converter
1616
import retrofit2.CallAdapter
1717
import retrofit2.converter.scalars.ScalarsConverterFactory
1818

19-
import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
19+
import retrofit2.converter.kotlinx.serialization.asConverterFactory
2020
import org.openapitools.client.infrastructure.Serializer.kotlinxSerializationJson
2121
import okhttp3.MediaType.Companion.toMediaType
2222

0 commit comments

Comments
 (0)