From 79dce87ad03c1f4bb58e2c35b85204f75735295f Mon Sep 17 00:00:00 2001 From: Lars Thern Date: Mon, 13 May 2024 11:15:06 +0200 Subject: [PATCH 1/2] Switch the jakewharton converter factory for the first party one --- .../src/main/resources/kotlin-client/build.gradle.mustache | 2 +- .../jvm-retrofit2/infrastructure/ApiClient.kt.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache index 0652f569ebe3..8d6b5c9733f8 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache @@ -191,7 +191,7 @@ dependencies { implementation "com.squareup.retrofit2:converter-moshi:$retrofitVersion" {{/moshi}} {{#kotlinx_serialization}} - implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0" + implementation "com.squareup.retrofit2:converter-kotlinx-serialization:$retrofitVersion" {{/kotlinx_serialization}} {{#jackson}} implementation "com.squareup.retrofit2:converter-jackson:$retrofitVersion" diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache index a2a4a20ae73d..1683b45e2ea8 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache @@ -55,7 +55,7 @@ import retrofit2.converter.jackson.JacksonConverterFactory {{/jackson}} {{#kotlinx_serialization}} -import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory +import retrofit2.converter.kotlinx.serialization.asConverterFactory import {{packageName}}.infrastructure.Serializer.kotlinxSerializationJson import okhttp3.MediaType.Companion.toMediaType {{/kotlinx_serialization}} From e5444c7a563edf70b943dfe608e89836671096a8 Mon Sep 17 00:00:00 2001 From: Lars Thern Date: Mon, 13 May 2024 12:04:52 +0200 Subject: [PATCH 2/2] Run all samples generation --- .../kotlin-retrofit2-kotlinx_serialization/build.gradle | 2 +- .../kotlin/org/openapitools/client/infrastructure/ApiClient.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/build.gradle b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/build.gradle index 6abb28c9793c..89fac530a5ce 100644 --- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/build.gradle +++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/build.gradle @@ -61,7 +61,7 @@ dependencies { implementation "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.2" implementation "com.squareup.okhttp3:logging-interceptor:4.12.0" implementation "com.squareup.retrofit2:retrofit:$retrofitVersion" - implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0" + implementation "com.squareup.retrofit2:converter-kotlinx-serialization:$retrofitVersion" implementation "com.squareup.retrofit2:converter-scalars:$retrofitVersion" testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" } diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index d2a8cf9ce38a..4c3ba1e58dd1 100644 --- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -16,7 +16,7 @@ import retrofit2.Converter import retrofit2.CallAdapter import retrofit2.converter.scalars.ScalarsConverterFactory -import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory +import retrofit2.converter.kotlinx.serialization.asConverterFactory import org.openapitools.client.infrastructure.Serializer.kotlinxSerializationJson import okhttp3.MediaType.Companion.toMediaType