From 7a89231c182d962ed5b0b9cb22191b0f047d7ce9 Mon Sep 17 00:00:00 2001 From: Julian Kalinowski Date: Mon, 1 Feb 2021 14:16:49 +0100 Subject: [PATCH 1/6] replace deprecated import --- .../src/main/resources/kotlin-client/data_class.mustache | 2 +- .../src/main/resources/kotlin-server/data_class.mustache | 2 +- .../src/main/resources/kotlin-vertx-server/data_class.mustache | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache index 3cf855654310..2dd048a74f57 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache @@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo {{/jackson}} {{#parcelizeModels}} import android.os.Parcelable -import kotlinx.android.parcel.Parcelize +import kotlinx.parcelize.Parcelize {{/parcelizeModels}} {{/multiplatform}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/data_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-server/data_class.mustache index 6c251cee2a6e..d9e9d591b7b9 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-server/data_class.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-server/data_class.mustache @@ -1,6 +1,6 @@ {{#parcelizeModels}} import android.os.Parcelable -import kotlinx.android.parcel.Parcelize +import kotlinx.parcelize.Parcelize {{/parcelizeModels}} {{#serializableModel}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-vertx-server/data_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-vertx-server/data_class.mustache index 74aa6aa1f260..67a6a37c7e03 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-vertx-server/data_class.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-vertx-server/data_class.mustache @@ -1,7 +1,7 @@ {{#parcelizeModels}} import android.os.Parcelable -import kotlinx.android.parcel.Parcelize +import kotlinx.parcelize.Parcelize {{/parcelizeModels}} import com.google.gson.annotations.SerializedName import com.fasterxml.jackson.annotation.JsonIgnoreProperties From 5063141c0c91205538e8bda59671d4a9b31da2ff Mon Sep 17 00:00:00 2001 From: Julian Kalinowski Date: Mon, 1 Feb 2021 17:37:45 +0100 Subject: [PATCH 2/6] update kotlin version to 1.4.20, add kotlin-parcelize plugin --- .../src/main/resources/kotlin-client/build.gradle.mustache | 5 ++++- samples/client/petstore/kotlin-gson/build.gradle | 2 +- samples/client/petstore/kotlin-jackson/build.gradle | 2 +- .../client/petstore/kotlin-json-request-string/build.gradle | 2 +- .../petstore/kotlin-jvm-okhttp4-coroutines/build.gradle | 2 +- samples/client/petstore/kotlin-moshi-codegen/build.gradle | 2 +- samples/client/petstore/kotlin-nonpublic/build.gradle | 2 +- samples/client/petstore/kotlin-nullable/build.gradle | 2 +- samples/client/petstore/kotlin-okhttp3/build.gradle | 2 +- samples/client/petstore/kotlin-retrofit2-rx3/build.gradle | 2 +- samples/client/petstore/kotlin-retrofit2/build.gradle | 2 +- samples/client/petstore/kotlin-string/build.gradle | 2 +- samples/client/petstore/kotlin-threetenbp/build.gradle | 2 +- samples/client/petstore/kotlin/build.gradle | 2 +- 14 files changed, 17 insertions(+), 14 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 a81f05ba3523..c807ca500964 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 @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.4.20' {{#jvm-retrofit2}} ext.retrofitVersion = '2.6.2' {{/jvm-retrofit2}} @@ -33,6 +33,9 @@ apply plugin: 'kotlin' {{#moshiCodeGen}} apply plugin: 'kotlin-kapt' {{/moshiCodeGen}} +{{#parcelizeModels}} +apply plugin: 'kotlin-parcelize' +{{/parcelizeModels}} repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin-gson/build.gradle b/samples/client/petstore/kotlin-gson/build.gradle index ce9cb568dd7b..0c7a11ec147a 100644 --- a/samples/client/petstore/kotlin-gson/build.gradle +++ b/samples/client/petstore/kotlin-gson/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.4.20' repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin-jackson/build.gradle b/samples/client/petstore/kotlin-jackson/build.gradle index c76aad33ca32..96578e36308e 100644 --- a/samples/client/petstore/kotlin-jackson/build.gradle +++ b/samples/client/petstore/kotlin-jackson/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.4.20' repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin-json-request-string/build.gradle b/samples/client/petstore/kotlin-json-request-string/build.gradle index 56be0bd0dd87..21ab84c47bbc 100644 --- a/samples/client/petstore/kotlin-json-request-string/build.gradle +++ b/samples/client/petstore/kotlin-json-request-string/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.4.20' repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle index ce9cb568dd7b..0c7a11ec147a 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.4.20' repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin-moshi-codegen/build.gradle b/samples/client/petstore/kotlin-moshi-codegen/build.gradle index 6b949799c398..191e341d8a01 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/build.gradle +++ b/samples/client/petstore/kotlin-moshi-codegen/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.4.20' repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin-nonpublic/build.gradle b/samples/client/petstore/kotlin-nonpublic/build.gradle index 56be0bd0dd87..21ab84c47bbc 100644 --- a/samples/client/petstore/kotlin-nonpublic/build.gradle +++ b/samples/client/petstore/kotlin-nonpublic/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.4.20' repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin-nullable/build.gradle b/samples/client/petstore/kotlin-nullable/build.gradle index 56be0bd0dd87..21ab84c47bbc 100644 --- a/samples/client/petstore/kotlin-nullable/build.gradle +++ b/samples/client/petstore/kotlin-nullable/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.4.20' repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin-okhttp3/build.gradle b/samples/client/petstore/kotlin-okhttp3/build.gradle index 662c2a62ce34..bb1a30055950 100644 --- a/samples/client/petstore/kotlin-okhttp3/build.gradle +++ b/samples/client/petstore/kotlin-okhttp3/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.4.20' repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/build.gradle b/samples/client/petstore/kotlin-retrofit2-rx3/build.gradle index a1c30b7a689f..b870989c9853 100644 --- a/samples/client/petstore/kotlin-retrofit2-rx3/build.gradle +++ b/samples/client/petstore/kotlin-retrofit2-rx3/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.4.20' ext.retrofitVersion = '2.6.2' ext.rxJava3Version = '3.0.4' diff --git a/samples/client/petstore/kotlin-retrofit2/build.gradle b/samples/client/petstore/kotlin-retrofit2/build.gradle index 035dac36829c..a41b15463635 100644 --- a/samples/client/petstore/kotlin-retrofit2/build.gradle +++ b/samples/client/petstore/kotlin-retrofit2/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.4.20' ext.retrofitVersion = '2.6.2' repositories { diff --git a/samples/client/petstore/kotlin-string/build.gradle b/samples/client/petstore/kotlin-string/build.gradle index 56be0bd0dd87..21ab84c47bbc 100644 --- a/samples/client/petstore/kotlin-string/build.gradle +++ b/samples/client/petstore/kotlin-string/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.4.20' repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin-threetenbp/build.gradle b/samples/client/petstore/kotlin-threetenbp/build.gradle index 886101b0fbef..0123235eeeb9 100644 --- a/samples/client/petstore/kotlin-threetenbp/build.gradle +++ b/samples/client/petstore/kotlin-threetenbp/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.4.20' repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin/build.gradle b/samples/client/petstore/kotlin/build.gradle index 56be0bd0dd87..21ab84c47bbc 100644 --- a/samples/client/petstore/kotlin/build.gradle +++ b/samples/client/petstore/kotlin/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.4.20' repositories { maven { url "https://repo1.maven.org/maven2" } From 2f9bbe804f370eaf7a8d83edf51b7b2e2ccf74c3 Mon Sep 17 00:00:00 2001 From: Julian Kalinowski Date: Mon, 1 Feb 2021 21:03:56 +0100 Subject: [PATCH 3/6] update samples to gradle 6.8.1 --- .../src/main/resources/kotlin-client/build.gradle.mustache | 2 +- samples/client/petstore/kotlin-gson/build.gradle | 2 +- samples/client/petstore/kotlin-jackson/build.gradle | 2 +- samples/client/petstore/kotlin-json-request-string/build.gradle | 2 +- .../client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle | 2 +- samples/client/petstore/kotlin-moshi-codegen/build.gradle | 2 +- samples/client/petstore/kotlin-nonpublic/build.gradle | 2 +- samples/client/petstore/kotlin-nullable/build.gradle | 2 +- samples/client/petstore/kotlin-okhttp3/build.gradle | 2 +- samples/client/petstore/kotlin-retrofit2-rx3/build.gradle | 2 +- samples/client/petstore/kotlin-retrofit2/build.gradle | 2 +- samples/client/petstore/kotlin-string/build.gradle | 2 +- samples/client/petstore/kotlin-threetenbp/build.gradle | 2 +- samples/client/petstore/kotlin/build.gradle | 2 +- 14 files changed, 14 insertions(+), 14 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 c807ca500964..1e72595d0ab5 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 @@ -2,7 +2,7 @@ group '{{groupId}}' version '{{artifactVersion}}' wrapper { - gradleVersion = '4.9' + gradleVersion = '6.8.1' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-gson/build.gradle b/samples/client/petstore/kotlin-gson/build.gradle index 0c7a11ec147a..95625ca00921 100644 --- a/samples/client/petstore/kotlin-gson/build.gradle +++ b/samples/client/petstore/kotlin-gson/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '4.9' + gradleVersion = '6.8.1' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-jackson/build.gradle b/samples/client/petstore/kotlin-jackson/build.gradle index 96578e36308e..9561dac51197 100644 --- a/samples/client/petstore/kotlin-jackson/build.gradle +++ b/samples/client/petstore/kotlin-jackson/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '4.9' + gradleVersion = '6.8.1' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-json-request-string/build.gradle b/samples/client/petstore/kotlin-json-request-string/build.gradle index 21ab84c47bbc..e3d4632a52ed 100644 --- a/samples/client/petstore/kotlin-json-request-string/build.gradle +++ b/samples/client/petstore/kotlin-json-request-string/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '4.9' + gradleVersion = '6.8.1' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle index 0c7a11ec147a..95625ca00921 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '4.9' + gradleVersion = '6.8.1' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-moshi-codegen/build.gradle b/samples/client/petstore/kotlin-moshi-codegen/build.gradle index 191e341d8a01..7d52cdbb5a0f 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/build.gradle +++ b/samples/client/petstore/kotlin-moshi-codegen/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '4.9' + gradleVersion = '6.8.1' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-nonpublic/build.gradle b/samples/client/petstore/kotlin-nonpublic/build.gradle index 21ab84c47bbc..e3d4632a52ed 100644 --- a/samples/client/petstore/kotlin-nonpublic/build.gradle +++ b/samples/client/petstore/kotlin-nonpublic/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '4.9' + gradleVersion = '6.8.1' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-nullable/build.gradle b/samples/client/petstore/kotlin-nullable/build.gradle index 21ab84c47bbc..e3d4632a52ed 100644 --- a/samples/client/petstore/kotlin-nullable/build.gradle +++ b/samples/client/petstore/kotlin-nullable/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '4.9' + gradleVersion = '6.8.1' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-okhttp3/build.gradle b/samples/client/petstore/kotlin-okhttp3/build.gradle index bb1a30055950..b12573a85ccf 100644 --- a/samples/client/petstore/kotlin-okhttp3/build.gradle +++ b/samples/client/petstore/kotlin-okhttp3/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '4.9' + gradleVersion = '6.8.1' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/build.gradle b/samples/client/petstore/kotlin-retrofit2-rx3/build.gradle index b870989c9853..f0281c383a22 100644 --- a/samples/client/petstore/kotlin-retrofit2-rx3/build.gradle +++ b/samples/client/petstore/kotlin-retrofit2-rx3/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '4.9' + gradleVersion = '6.8.1' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-retrofit2/build.gradle b/samples/client/petstore/kotlin-retrofit2/build.gradle index a41b15463635..0a6481e6d153 100644 --- a/samples/client/petstore/kotlin-retrofit2/build.gradle +++ b/samples/client/petstore/kotlin-retrofit2/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '4.9' + gradleVersion = '6.8.1' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-string/build.gradle b/samples/client/petstore/kotlin-string/build.gradle index 21ab84c47bbc..e3d4632a52ed 100644 --- a/samples/client/petstore/kotlin-string/build.gradle +++ b/samples/client/petstore/kotlin-string/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '4.9' + gradleVersion = '6.8.1' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-threetenbp/build.gradle b/samples/client/petstore/kotlin-threetenbp/build.gradle index 0123235eeeb9..49fdda22715a 100644 --- a/samples/client/petstore/kotlin-threetenbp/build.gradle +++ b/samples/client/petstore/kotlin-threetenbp/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '4.9' + gradleVersion = '6.8.1' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin/build.gradle b/samples/client/petstore/kotlin/build.gradle index 21ab84c47bbc..e3d4632a52ed 100644 --- a/samples/client/petstore/kotlin/build.gradle +++ b/samples/client/petstore/kotlin/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '4.9' + gradleVersion = '6.8.1' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } From c5b748164c7b0bbfed93dbb23c7ea25bd141a6c2 Mon Sep 17 00:00:00 2001 From: Bruno Coelho <4brunu@gmail.com> Date: Fri, 5 Feb 2021 11:19:03 +0000 Subject: [PATCH 4/6] Revert "update samples to gradle 6.8.1" This reverts commit 2f9bbe804f370eaf7a8d83edf51b7b2e2ccf74c3. --- .../src/main/resources/kotlin-client/build.gradle.mustache | 2 +- samples/client/petstore/kotlin-gson/build.gradle | 2 +- samples/client/petstore/kotlin-jackson/build.gradle | 2 +- samples/client/petstore/kotlin-json-request-string/build.gradle | 2 +- .../client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle | 2 +- samples/client/petstore/kotlin-moshi-codegen/build.gradle | 2 +- samples/client/petstore/kotlin-nonpublic/build.gradle | 2 +- samples/client/petstore/kotlin-nullable/build.gradle | 2 +- samples/client/petstore/kotlin-okhttp3/build.gradle | 2 +- samples/client/petstore/kotlin-retrofit2-rx3/build.gradle | 2 +- samples/client/petstore/kotlin-retrofit2/build.gradle | 2 +- samples/client/petstore/kotlin-string/build.gradle | 2 +- samples/client/petstore/kotlin-threetenbp/build.gradle | 2 +- samples/client/petstore/kotlin/build.gradle | 2 +- 14 files changed, 14 insertions(+), 14 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 1e72595d0ab5..c807ca500964 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 @@ -2,7 +2,7 @@ group '{{groupId}}' version '{{artifactVersion}}' wrapper { - gradleVersion = '6.8.1' + gradleVersion = '4.9' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-gson/build.gradle b/samples/client/petstore/kotlin-gson/build.gradle index 95625ca00921..0c7a11ec147a 100644 --- a/samples/client/petstore/kotlin-gson/build.gradle +++ b/samples/client/petstore/kotlin-gson/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '6.8.1' + gradleVersion = '4.9' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-jackson/build.gradle b/samples/client/petstore/kotlin-jackson/build.gradle index 9561dac51197..96578e36308e 100644 --- a/samples/client/petstore/kotlin-jackson/build.gradle +++ b/samples/client/petstore/kotlin-jackson/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '6.8.1' + gradleVersion = '4.9' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-json-request-string/build.gradle b/samples/client/petstore/kotlin-json-request-string/build.gradle index e3d4632a52ed..21ab84c47bbc 100644 --- a/samples/client/petstore/kotlin-json-request-string/build.gradle +++ b/samples/client/petstore/kotlin-json-request-string/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '6.8.1' + gradleVersion = '4.9' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle index 95625ca00921..0c7a11ec147a 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '6.8.1' + gradleVersion = '4.9' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-moshi-codegen/build.gradle b/samples/client/petstore/kotlin-moshi-codegen/build.gradle index 7d52cdbb5a0f..191e341d8a01 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/build.gradle +++ b/samples/client/petstore/kotlin-moshi-codegen/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '6.8.1' + gradleVersion = '4.9' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-nonpublic/build.gradle b/samples/client/petstore/kotlin-nonpublic/build.gradle index e3d4632a52ed..21ab84c47bbc 100644 --- a/samples/client/petstore/kotlin-nonpublic/build.gradle +++ b/samples/client/petstore/kotlin-nonpublic/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '6.8.1' + gradleVersion = '4.9' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-nullable/build.gradle b/samples/client/petstore/kotlin-nullable/build.gradle index e3d4632a52ed..21ab84c47bbc 100644 --- a/samples/client/petstore/kotlin-nullable/build.gradle +++ b/samples/client/petstore/kotlin-nullable/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '6.8.1' + gradleVersion = '4.9' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-okhttp3/build.gradle b/samples/client/petstore/kotlin-okhttp3/build.gradle index b12573a85ccf..bb1a30055950 100644 --- a/samples/client/petstore/kotlin-okhttp3/build.gradle +++ b/samples/client/petstore/kotlin-okhttp3/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '6.8.1' + gradleVersion = '4.9' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/build.gradle b/samples/client/petstore/kotlin-retrofit2-rx3/build.gradle index f0281c383a22..b870989c9853 100644 --- a/samples/client/petstore/kotlin-retrofit2-rx3/build.gradle +++ b/samples/client/petstore/kotlin-retrofit2-rx3/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '6.8.1' + gradleVersion = '4.9' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-retrofit2/build.gradle b/samples/client/petstore/kotlin-retrofit2/build.gradle index 0a6481e6d153..a41b15463635 100644 --- a/samples/client/petstore/kotlin-retrofit2/build.gradle +++ b/samples/client/petstore/kotlin-retrofit2/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '6.8.1' + gradleVersion = '4.9' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-string/build.gradle b/samples/client/petstore/kotlin-string/build.gradle index e3d4632a52ed..21ab84c47bbc 100644 --- a/samples/client/petstore/kotlin-string/build.gradle +++ b/samples/client/petstore/kotlin-string/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '6.8.1' + gradleVersion = '4.9' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin-threetenbp/build.gradle b/samples/client/petstore/kotlin-threetenbp/build.gradle index 49fdda22715a..0123235eeeb9 100644 --- a/samples/client/petstore/kotlin-threetenbp/build.gradle +++ b/samples/client/petstore/kotlin-threetenbp/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '6.8.1' + gradleVersion = '4.9' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/samples/client/petstore/kotlin/build.gradle b/samples/client/petstore/kotlin/build.gradle index e3d4632a52ed..21ab84c47bbc 100644 --- a/samples/client/petstore/kotlin/build.gradle +++ b/samples/client/petstore/kotlin/build.gradle @@ -2,7 +2,7 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '6.8.1' + gradleVersion = '4.9' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } From 740687918f6d005ec31752ec8ef7908aaad3bd3f Mon Sep 17 00:00:00 2001 From: Bruno Coelho <4brunu@gmail.com> Date: Fri, 5 Feb 2021 11:44:28 +0000 Subject: [PATCH 5/6] [kotlin][client] try to fix CI --- samples/client/petstore/kotlin-gson/pom.xml | 16 ++++- .../client/petstore/kotlin-jackson/pom.xml | 16 ++++- .../kotlin-json-request-string/pom.xml | 16 ++++- .../kotlin-jvm-okhttp4-coroutines/pom.xml | 60 +++++++++++++++++++ .../petstore/kotlin-moshi-codegen/pom.xml | 16 ++++- .../client/petstore/kotlin-nonpublic/pom.xml | 16 ++++- .../client/petstore/kotlin-nullable/pom.xml | 16 ++++- .../client/petstore/kotlin-okhttp3/pom.xml | 16 ++++- .../petstore/kotlin-retrofit2-rx3/pom.xml | 16 ++++- .../client/petstore/kotlin-retrofit2/pom.xml | 16 ++++- samples/client/petstore/kotlin-string/pom.xml | 1 + .../client/petstore/kotlin-threetenbp/pom.xml | 1 + .../petstore/kotlin-uppercase-enum/pom.xml | 60 +++++++++++++++++++ samples/client/petstore/kotlin/pom.xml | 16 ++++- 14 files changed, 272 insertions(+), 10 deletions(-) create mode 100644 samples/client/petstore/kotlin-jvm-okhttp4-coroutines/pom.xml create mode 100644 samples/client/petstore/kotlin-uppercase-enum/pom.xml diff --git a/samples/client/petstore/kotlin-gson/pom.xml b/samples/client/petstore/kotlin-gson/pom.xml index 56d7495846bc..47e393fec11a 100644 --- a/samples/client/petstore/kotlin-gson/pom.xml +++ b/samples/client/petstore/kotlin-gson/pom.xml @@ -27,7 +27,7 @@ 1.2.1 - bundle-test + bundle-install integration-test exec @@ -35,6 +35,20 @@ gradle + wrapper + + + + + bundle-test + integration-test + + exec + + + ./gradlew + + clean test diff --git a/samples/client/petstore/kotlin-jackson/pom.xml b/samples/client/petstore/kotlin-jackson/pom.xml index 76eedb89596d..f57be9c406e7 100644 --- a/samples/client/petstore/kotlin-jackson/pom.xml +++ b/samples/client/petstore/kotlin-jackson/pom.xml @@ -27,7 +27,7 @@ 1.2.1 - bundle-test + bundle-install integration-test exec @@ -35,6 +35,20 @@ gradle + wrapper + + + + + bundle-test + integration-test + + exec + + + ./gradlew + + clean test diff --git a/samples/client/petstore/kotlin-json-request-string/pom.xml b/samples/client/petstore/kotlin-json-request-string/pom.xml index 947997039a72..0eef90f38170 100644 --- a/samples/client/petstore/kotlin-json-request-string/pom.xml +++ b/samples/client/petstore/kotlin-json-request-string/pom.xml @@ -27,7 +27,7 @@ 1.2.1 - bundle-test + bundle-install integration-test exec @@ -35,6 +35,20 @@ gradle + wrapper + + + + + bundle-test + integration-test + + exec + + + ./gradlew + + clean test diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/pom.xml b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/pom.xml new file mode 100644 index 000000000000..2249107ef60a --- /dev/null +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/pom.xml @@ -0,0 +1,60 @@ + + 4.0.0 + org.openapitools + KotlinPetstoreOkhttp4CoroutinesTests + pom + 1.0-SNAPSHOT + kotlin-jvm-okhttp4-coroutines + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory} + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + bundle-install + integration-test + + exec + + + gradle + + wrapper + + + + + bundle-test + integration-test + + exec + + + ./gradlew + + clean + test + + + + + + + + diff --git a/samples/client/petstore/kotlin-moshi-codegen/pom.xml b/samples/client/petstore/kotlin-moshi-codegen/pom.xml index 9cae12c1a8bd..90c1f037a01b 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/pom.xml +++ b/samples/client/petstore/kotlin-moshi-codegen/pom.xml @@ -27,7 +27,7 @@ 1.2.1 - bundle-test + bundle-install integration-test exec @@ -35,6 +35,20 @@ gradle + wrapper + + + + + bundle-test + integration-test + + exec + + + ./gradlew + + clean test diff --git a/samples/client/petstore/kotlin-nonpublic/pom.xml b/samples/client/petstore/kotlin-nonpublic/pom.xml index 2b400e564b9a..266078aacef4 100644 --- a/samples/client/petstore/kotlin-nonpublic/pom.xml +++ b/samples/client/petstore/kotlin-nonpublic/pom.xml @@ -27,7 +27,7 @@ 1.2.1 - bundle-test + bundle-install integration-test exec @@ -35,6 +35,20 @@ gradle + wrapper + + + + + bundle-test + integration-test + + exec + + + ./gradlew + + clean test diff --git a/samples/client/petstore/kotlin-nullable/pom.xml b/samples/client/petstore/kotlin-nullable/pom.xml index 2bf0f9666d6c..d0bb127ff442 100644 --- a/samples/client/petstore/kotlin-nullable/pom.xml +++ b/samples/client/petstore/kotlin-nullable/pom.xml @@ -27,7 +27,7 @@ 1.2.1 - bundle-test + bundle-install integration-test exec @@ -35,6 +35,20 @@ gradle + wrapper + + + + + bundle-test + integration-test + + exec + + + ./gradlew + + clean test diff --git a/samples/client/petstore/kotlin-okhttp3/pom.xml b/samples/client/petstore/kotlin-okhttp3/pom.xml index 37cf659dcacf..345c795e5846 100644 --- a/samples/client/petstore/kotlin-okhttp3/pom.xml +++ b/samples/client/petstore/kotlin-okhttp3/pom.xml @@ -27,7 +27,7 @@ 1.2.1 - bundle-test + bundle-install integration-test exec @@ -35,6 +35,20 @@ gradle + wrapper + + + + + bundle-test + integration-test + + exec + + + ./gradlew + + clean test diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/pom.xml b/samples/client/petstore/kotlin-retrofit2-rx3/pom.xml index 1ee09680f372..4d99176011f3 100644 --- a/samples/client/petstore/kotlin-retrofit2-rx3/pom.xml +++ b/samples/client/petstore/kotlin-retrofit2-rx3/pom.xml @@ -27,7 +27,7 @@ 1.2.1 - bundle-test + bundle-install integration-test exec @@ -35,6 +35,20 @@ gradle + wrapper + + + + + bundle-test + integration-test + + exec + + + ./gradlew + + clean test diff --git a/samples/client/petstore/kotlin-retrofit2/pom.xml b/samples/client/petstore/kotlin-retrofit2/pom.xml index a2a34c203fa8..fa88e4879fa2 100644 --- a/samples/client/petstore/kotlin-retrofit2/pom.xml +++ b/samples/client/petstore/kotlin-retrofit2/pom.xml @@ -27,7 +27,7 @@ 1.2.1 - bundle-test + bundle-install integration-test exec @@ -35,6 +35,20 @@ gradle + wrapper + + + + + bundle-test + integration-test + + exec + + + ./gradlew + + clean test diff --git a/samples/client/petstore/kotlin-string/pom.xml b/samples/client/petstore/kotlin-string/pom.xml index 51365b8eae1c..d040b7533bf4 100644 --- a/samples/client/petstore/kotlin-string/pom.xml +++ b/samples/client/petstore/kotlin-string/pom.xml @@ -48,6 +48,7 @@ ./gradlew + clean test diff --git a/samples/client/petstore/kotlin-threetenbp/pom.xml b/samples/client/petstore/kotlin-threetenbp/pom.xml index 6875e7432946..74b29a98a7c7 100644 --- a/samples/client/petstore/kotlin-threetenbp/pom.xml +++ b/samples/client/petstore/kotlin-threetenbp/pom.xml @@ -48,6 +48,7 @@ ./gradlew + clean test diff --git a/samples/client/petstore/kotlin-uppercase-enum/pom.xml b/samples/client/petstore/kotlin-uppercase-enum/pom.xml new file mode 100644 index 000000000000..e7a439414f8b --- /dev/null +++ b/samples/client/petstore/kotlin-uppercase-enum/pom.xml @@ -0,0 +1,60 @@ + + 4.0.0 + org.openapitools + KotlinPetstoreUppercaseEnumTests + pom + 1.0-SNAPSHOT + kotlin-uppercase-enum + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory} + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + bundle-install + integration-test + + exec + + + gradle + + wrapper + + + + + bundle-test + integration-test + + exec + + + ./gradlew + + clean + test + + + + + + + + diff --git a/samples/client/petstore/kotlin/pom.xml b/samples/client/petstore/kotlin/pom.xml index e52f9e969b08..a6140e49deaf 100644 --- a/samples/client/petstore/kotlin/pom.xml +++ b/samples/client/petstore/kotlin/pom.xml @@ -27,7 +27,7 @@ 1.2.1 - bundle-test + bundle-install integration-test exec @@ -35,6 +35,20 @@ gradle + wrapper + + + + + bundle-test + integration-test + + exec + + + ./gradlew + + clean test From 893e6c55741cae020ec5f445591d4e1bc14235b2 Mon Sep 17 00:00:00 2001 From: Bruno Coelho <4brunu@gmail.com> Date: Fri, 5 Feb 2021 12:42:36 +0000 Subject: [PATCH 6/6] [kotlin][client] try to fix CI by reverting kotlin --- .../src/main/resources/kotlin-client/build.gradle.mustache | 2 +- samples/client/petstore/kotlin-gson/build.gradle | 2 +- samples/client/petstore/kotlin-jackson/build.gradle | 2 +- samples/client/petstore/kotlin-json-request-string/build.gradle | 2 +- .../client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle | 2 +- samples/client/petstore/kotlin-moshi-codegen/build.gradle | 2 +- samples/client/petstore/kotlin-nonpublic/build.gradle | 2 +- samples/client/petstore/kotlin-nullable/build.gradle | 2 +- samples/client/petstore/kotlin-okhttp3/build.gradle | 2 +- samples/client/petstore/kotlin-retrofit2-rx3/build.gradle | 2 +- samples/client/petstore/kotlin-retrofit2/build.gradle | 2 +- samples/client/petstore/kotlin-string/build.gradle | 2 +- samples/client/petstore/kotlin-threetenbp/build.gradle | 2 +- samples/client/petstore/kotlin/build.gradle | 2 +- 14 files changed, 14 insertions(+), 14 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 c807ca500964..43730dc02e66 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 @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.4.20' + ext.kotlin_version = '1.3.61' {{#jvm-retrofit2}} ext.retrofitVersion = '2.6.2' {{/jvm-retrofit2}} diff --git a/samples/client/petstore/kotlin-gson/build.gradle b/samples/client/petstore/kotlin-gson/build.gradle index 0c7a11ec147a..ce9cb568dd7b 100644 --- a/samples/client/petstore/kotlin-gson/build.gradle +++ b/samples/client/petstore/kotlin-gson/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.4.20' + ext.kotlin_version = '1.3.61' repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin-jackson/build.gradle b/samples/client/petstore/kotlin-jackson/build.gradle index 96578e36308e..c76aad33ca32 100644 --- a/samples/client/petstore/kotlin-jackson/build.gradle +++ b/samples/client/petstore/kotlin-jackson/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.4.20' + ext.kotlin_version = '1.3.61' repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin-json-request-string/build.gradle b/samples/client/petstore/kotlin-json-request-string/build.gradle index 21ab84c47bbc..56be0bd0dd87 100644 --- a/samples/client/petstore/kotlin-json-request-string/build.gradle +++ b/samples/client/petstore/kotlin-json-request-string/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.4.20' + ext.kotlin_version = '1.3.61' repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle index 0c7a11ec147a..ce9cb568dd7b 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.4.20' + ext.kotlin_version = '1.3.61' repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin-moshi-codegen/build.gradle b/samples/client/petstore/kotlin-moshi-codegen/build.gradle index 191e341d8a01..6b949799c398 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/build.gradle +++ b/samples/client/petstore/kotlin-moshi-codegen/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.4.20' + ext.kotlin_version = '1.3.61' repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin-nonpublic/build.gradle b/samples/client/petstore/kotlin-nonpublic/build.gradle index 21ab84c47bbc..56be0bd0dd87 100644 --- a/samples/client/petstore/kotlin-nonpublic/build.gradle +++ b/samples/client/petstore/kotlin-nonpublic/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.4.20' + ext.kotlin_version = '1.3.61' repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin-nullable/build.gradle b/samples/client/petstore/kotlin-nullable/build.gradle index 21ab84c47bbc..56be0bd0dd87 100644 --- a/samples/client/petstore/kotlin-nullable/build.gradle +++ b/samples/client/petstore/kotlin-nullable/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.4.20' + ext.kotlin_version = '1.3.61' repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin-okhttp3/build.gradle b/samples/client/petstore/kotlin-okhttp3/build.gradle index bb1a30055950..662c2a62ce34 100644 --- a/samples/client/petstore/kotlin-okhttp3/build.gradle +++ b/samples/client/petstore/kotlin-okhttp3/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.4.20' + ext.kotlin_version = '1.3.61' repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/build.gradle b/samples/client/petstore/kotlin-retrofit2-rx3/build.gradle index b870989c9853..a1c30b7a689f 100644 --- a/samples/client/petstore/kotlin-retrofit2-rx3/build.gradle +++ b/samples/client/petstore/kotlin-retrofit2-rx3/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.4.20' + ext.kotlin_version = '1.3.61' ext.retrofitVersion = '2.6.2' ext.rxJava3Version = '3.0.4' diff --git a/samples/client/petstore/kotlin-retrofit2/build.gradle b/samples/client/petstore/kotlin-retrofit2/build.gradle index a41b15463635..035dac36829c 100644 --- a/samples/client/petstore/kotlin-retrofit2/build.gradle +++ b/samples/client/petstore/kotlin-retrofit2/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.4.20' + ext.kotlin_version = '1.3.61' ext.retrofitVersion = '2.6.2' repositories { diff --git a/samples/client/petstore/kotlin-string/build.gradle b/samples/client/petstore/kotlin-string/build.gradle index 21ab84c47bbc..56be0bd0dd87 100644 --- a/samples/client/petstore/kotlin-string/build.gradle +++ b/samples/client/petstore/kotlin-string/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.4.20' + ext.kotlin_version = '1.3.61' repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin-threetenbp/build.gradle b/samples/client/petstore/kotlin-threetenbp/build.gradle index 0123235eeeb9..886101b0fbef 100644 --- a/samples/client/petstore/kotlin-threetenbp/build.gradle +++ b/samples/client/petstore/kotlin-threetenbp/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.4.20' + ext.kotlin_version = '1.3.61' repositories { maven { url "https://repo1.maven.org/maven2" } diff --git a/samples/client/petstore/kotlin/build.gradle b/samples/client/petstore/kotlin/build.gradle index 21ab84c47bbc..56be0bd0dd87 100644 --- a/samples/client/petstore/kotlin/build.gradle +++ b/samples/client/petstore/kotlin/build.gradle @@ -7,7 +7,7 @@ wrapper { } buildscript { - ext.kotlin_version = '1.4.20' + ext.kotlin_version = '1.3.61' repositories { maven { url "https://repo1.maven.org/maven2" }