loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-18 21:47:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 6.0.x

Browse Source
This commit is contained in:
William Cheng
2021-02-12 18:48:20 +08:00
parent 0fdb003e57 0e16eba06a
commit b4f4d7434b
750 changed files with 34048 additions and 10711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
samples/client/petstore/kotlin-retrofit2/build.gradle
View File

@@ -2,13 +2,13 @@ group 'org.openapitools'
version '1.0.0'
wrapper {
gradleVersion = '4.9'
gradleVersion = '6.8.2'
distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
}
buildscript {
ext.kotlin_version = '1.3.61'
ext.retrofitVersion = '2.6.2'
ext.kotlin_version = '1.4.20'
ext.retrofitVersion = '2.7.2'
repositories {
maven { url "https://repo1.maven.org/maven2" }
@@ -31,12 +31,11 @@ test {
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
compile "com.squareup.moshi:moshi-kotlin:1.9.2"
compile "com.squareup.moshi:moshi-adapters:1.9.2"
compile "com.squareup.moshi:moshi-kotlin:1.11.0"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.0"
compile "com.squareup.okhttp3:logging-interceptor:4.4.0"
compile "com.squareup.okhttp3:logging-interceptor:4.9.0"
compile "com.squareup.retrofit2:retrofit:$retrofitVersion"
compile "com.squareup.retrofit2:converter-moshi:$retrofitVersion"
compile "com.squareup.retrofit2:converter-scalars:$retrofitVersion"
testCompile "io.kotlintest:kotlintest-runner-junit5:3.1.0"
testCompile "io.kotlintest:kotlintest-runner-junit5:3.4.2"
}

17
samples/client/petstore/kotlin-retrofit2/pom.xml
View File

@@ -27,7 +27,7 @@
<version>1.2.1</version>
<executions>
<execution>
<id>bundle-test</id>
<id>bundle-install</id>
<phase>integration-test</phase>
<goals>
<goal>exec</goal>
@@ -35,7 +35,20 @@
<configuration>
<executable>gradle</executable>
<arguments>
<argument>test</argument>
<argument>wrapper</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>bundle-test</id>
<phase>integration-test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>./gradlew</executable>
<arguments>
<argument>build</argument>
</arguments>
</configuration>
</execution>

2
samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt
View File

@@ -1,14 +1,12 @@
package org.openapitools.client.infrastructure
import com.squareup.moshi.Moshi
import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import java.util.Date
object Serializer {
@JvmStatic
val moshiBuilder: Moshi.Builder = Moshi.Builder()
.add(Date::class.java, Rfc3339DateJsonAdapter().nullSafe())
.add(OffsetDateTimeAdapter())
.add(LocalDateTimeAdapter())
.add(LocalDateAdapter())