From 7d39e5202c50db9ec1721174fb746d1fac5c95a4 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 14 Dec 2019 14:41:21 +0800 Subject: [PATCH 1/7] run all script in circleci --- CI/circle_parallel.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh index b7142b28a9dc..60bc0a4c8425 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -54,6 +54,9 @@ else java -version #cp CI/pom.xml.circleci.java7 pom.xml mvn --quiet verify -Psamples.circleci.jdk7 + + # run all scripts + ./bin/run-all-petstore fi From 73d0b0a701e1c19367718957ba3b9946c24cd3cb Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 14 Dec 2019 14:56:50 +0800 Subject: [PATCH 2/7] test kotlin clients --- bin/kotlin-client-moshi-codegen.sh | 0 pom.xml | 2 ++ 2 files changed, 2 insertions(+) mode change 100644 => 100755 bin/kotlin-client-moshi-codegen.sh diff --git a/bin/kotlin-client-moshi-codegen.sh b/bin/kotlin-client-moshi-codegen.sh old mode 100644 new mode 100755 diff --git a/pom.xml b/pom.xml index a2629d645729..e1b08cfc5f96 100644 --- a/pom.xml +++ b/pom.xml @@ -1254,9 +1254,11 @@ samples/client/petstore/kotlin/ samples/client/petstore/kotlin-gson/ samples/client/petstore/kotlin-nonpublic/ + samples/client/petstore/kotlin-nullable/ samples/client/petstore/kotlin-okhttp3/ samples/client/petstore/kotlin-threetenbp/ samples/client/petstore/kotlin-string/ + samples/client/petstore/kotlin-koshi-codegen/ samples/server/petstore/erlang-server samples/server/petstore/jaxrs/jersey2 From a62bf1c17b86a26492a8aaeb653f97b89b116dbc Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 14 Dec 2019 15:10:38 +0800 Subject: [PATCH 3/7] add new files --- .../petstore/kotlin-moshi-codegen/pom.xml | 46 +++++++++++++++++++ .../client/petstore/kotlin-nullable/pom.xml | 46 +++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 samples/client/petstore/kotlin-moshi-codegen/pom.xml create mode 100644 samples/client/petstore/kotlin-nullable/pom.xml diff --git a/samples/client/petstore/kotlin-moshi-codegen/pom.xml b/samples/client/petstore/kotlin-moshi-codegen/pom.xml new file mode 100644 index 000000000000..9cae12c1a8bd --- /dev/null +++ b/samples/client/petstore/kotlin-moshi-codegen/pom.xml @@ -0,0 +1,46 @@ + + 4.0.0 + io.swagger + KotlinMoshiPetstoreClientTests + pom + 1.0-SNAPSHOT + Kotlin Moshi Petstore Client + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory} + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + bundle-test + integration-test + + exec + + + gradle + + test + + + + + + + + diff --git a/samples/client/petstore/kotlin-nullable/pom.xml b/samples/client/petstore/kotlin-nullable/pom.xml new file mode 100644 index 000000000000..2bf0f9666d6c --- /dev/null +++ b/samples/client/petstore/kotlin-nullable/pom.xml @@ -0,0 +1,46 @@ + + 4.0.0 + io.swagger + KotlinNullablePetstoreClientTests + pom + 1.0-SNAPSHOT + Kotlin Nullable Petstore Client + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory} + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + bundle-test + integration-test + + exec + + + gradle + + test + + + + + + + + From 7e5e5d096554c51fe055086a1aab6f40a864a79b Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 14 Dec 2019 16:55:04 +0800 Subject: [PATCH 4/7] undo chanages to circleci script --- CI/circle_parallel.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh index 60bc0a4c8425..b7142b28a9dc 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -54,9 +54,6 @@ else java -version #cp CI/pom.xml.circleci.java7 pom.xml mvn --quiet verify -Psamples.circleci.jdk7 - - # run all scripts - ./bin/run-all-petstore fi From 31b80737bcbd851cc7a0276cf2458dfa0520c405 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 14 Dec 2019 17:57:51 +0800 Subject: [PATCH 5/7] update samples --- .../kotlin/org/openapitools/client/infrastructure/Serializer.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt index 334085f64c52..087015252b8e 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt @@ -2,7 +2,6 @@ package org.openapitools.client.infrastructure import com.squareup.moshi.Moshi import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter - import java.util.Date object Serializer { @@ -13,6 +12,5 @@ object Serializer { .add(LocalDateAdapter()) .add(UUIDAdapter()) .add(ByteArrayAdapter()) - .build() } From e1d4b217358f6b50520c89d7a743d36492858508 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 14 Dec 2019 18:59:00 +0800 Subject: [PATCH 6/7] update bitwise config --- CI/bitrise.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/CI/bitrise.yml b/CI/bitrise.yml index f31294044f62..8a572ab864ad 100644 --- a/CI/bitrise.yml +++ b/CI/bitrise.yml @@ -40,12 +40,21 @@ workflows: sh bin/swift4-all.sh - script@1.1.5: + title: Run Swift4 tests inputs: - content: | #!/usr/bin/env bash set -e - ./samples/client/petstore/swift4/swift4_test_all.sh && ./samples/client/test/swift4/swift4_test_all.sh && exit ${PIPESTATUS[0]} - title: Run Swift4 tests + ./samples/client/petstore/swift4/swift4_test_all.sh + ./samples/client/test/swift4/swift4_test_all.sh + - script@1.1.5: + title: Run all bin scripts + inputs: + - content: |- + #!/usr/bin/env bash + + set -e + ./bin/run-all-petstore From 377a9d3a3f481d7124a56a222e6f900a2c5e2efa Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sun, 15 Dec 2019 17:34:56 +0800 Subject: [PATCH 7/7] fix typo --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e1b08cfc5f96..ee48ff0508fd 100644 --- a/pom.xml +++ b/pom.xml @@ -1258,7 +1258,7 @@ samples/client/petstore/kotlin-okhttp3/ samples/client/petstore/kotlin-threetenbp/ samples/client/petstore/kotlin-string/ - samples/client/petstore/kotlin-koshi-codegen/ + samples/client/petstore/kotlin-moshi-codegen/ samples/server/petstore/erlang-server samples/server/petstore/jaxrs/jersey2