Skip to content

Feature/update kotlin dependecies template #12966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Sep 4, 2022
Merged

Feature/update kotlin dependecies template #12966

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c12ecb5
Merge branch 'master' into feature/update-kotlin-dependecies-template
Marek00Malik Jul 21, 2022
b3e75c0
update Kotlin & Ktor versions
Marek00Malik Jul 21, 2022
5b2dad9
update samples
Marek00Malik Jul 21, 2022
8ab8782
fix gradle version
Marek00Malik Jul 21, 2022
9f513c5
update the ktor client templates and project samples
Marek00Malik Jul 22, 2022
43ddbd3
update the ktor client templates and project samples
Marek00Malik Jul 22, 2022
2271590
revert multiplatform upgrade
Marek00Malik Jul 22, 2022
0860308
update kotlin multiplatform
Marek00Malik Jul 22, 2022
0eb6c55
upload kotlin Multiplatform samples
Marek00Malik Jul 22, 2022
4550eab
Merge branch 'OpenAPITools:master' into feature/update-kotlin-depende…
Marek00Malik Jul 22, 2022
be96d45
Merge remote-tracking branch 'origin/feature/update-kotlin-dependecie…
Marek00Malik Jul 22, 2022
784bd96
fix gson ktor sample
Marek00Malik Jul 24, 2022
856e652
update samples
Marek00Malik Jul 24, 2022
4dc3a28
fix: unused imports
Marek00Malik Aug 9, 2022
4e57c7a
Merge branch 'master' into feature/update-kotlin-dependecies-template
Marek00Malik Aug 9, 2022
df6b8ab
fix imports of ApiClient
Marek00Malik Aug 9, 2022
3bcd334
update kotlin samples
Marek00Malik Aug 9, 2022
cef4d3a
Merge branch 'master' into feature/update-kotlin-dependecies-template
Marek00Malik Aug 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ version '{{artifactVersion}}'
{{^omitGradleWrapper}}

wrapper {
gradleVersion = '6.8.3'
gradleVersion = '7.5'
distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
}
{{/omitGradleWrapper}}

buildscript {
ext.kotlin_version = '1.5.10'
ext.kotlin_version = '1.6.10'
{{#jvm-ktor}}
ext.ktor_version = '1.6.7'
ext.ktor_version = '2.0.3'
{{/jvm-ktor}}
{{#jvm-retrofit2}}
ext.retrofitVersion = '2.9.0'
Expand Down Expand Up @@ -72,31 +72,31 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
{{^doNotUseRxAndCoroutines}}
{{#useCoroutines}}
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3"
{{/useCoroutines}}
{{/doNotUseRxAndCoroutines}}
{{#moshi}}
{{^moshiCodeGen}}
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
implementation "com.squareup.moshi:moshi-kotlin:1.12.0"
implementation "com.squareup.moshi:moshi-adapters:1.12.0"
implementation "com.squareup.moshi:moshi-kotlin:1.13.0"
implementation "com.squareup.moshi:moshi-adapters:1.13.0"
{{/moshiCodeGen}}
{{#moshiCodeGen}}
implementation "com.squareup.moshi:moshi:1.12.0"
implementation "com.squareup.moshi:moshi-adapters:1.12.0"
kapt "com.squareup.moshi:moshi-kotlin-codegen:1.12.0"
implementation "com.squareup.moshi:moshi:1.13.0"
implementation "com.squareup.moshi:moshi-adapters:1.13.0"
kapt "com.squareup.moshi:moshi-kotlin-codegen:1.13.0"
{{/moshiCodeGen}}
{{/moshi}}
{{#gson}}
implementation "com.google.code.gson:gson:2.8.7"
implementation "com.google.code.gson:gson:2.9.0"
{{/gson}}
{{#jackson}}
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.12.3"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.3"
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.13.3"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.3"
{{/jackson}}
{{#kotlinx_serialization}}
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.1"
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3"
{{/kotlinx_serialization}}
{{#jvm-ktor}}
implementation "io.ktor:ktor-client-core:$ktor_version"
Expand All @@ -111,7 +111,7 @@ dependencies {
implementation "com.squareup.okhttp3:okhttp:3.12.13"
{{/jvm-okhttp3}}
{{#jvm-okhttp4}}
implementation "com.squareup.okhttp3:okhttp:4.9.1"
implementation "com.squareup.okhttp3:okhttp:4.10.0"
{{/jvm-okhttp4}}
{{#threetenbp}}
implementation "org.threeten:threetenbp:1.5.1"
Expand All @@ -120,7 +120,7 @@ dependencies {
{{#hasOAuthMethods}}
implementation "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.2"
{{/hasOAuthMethods}}
implementation "com.squareup.okhttp3:logging-interceptor:4.9.1"
implementation "com.squareup.okhttp3:logging-interceptor:4.10.0"
{{#useRxJava}}
implementation "io.reactivex:rxjava:$rxJavaVersion"
implementation "com.squareup.retrofit2:adapter-rxjava:$retrofitVersion"
Expand Down
8 changes: 4 additions & 4 deletions ...erator/src/main/resources/kotlin-client/libraries/multiplatform/build.gradle.kts.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ plugins {
group = "{{groupId}}"
version = "{{artifactVersion}}"

val kotlin_version = "1.6.0"
val coroutines_version = "1.5.2"
val serialization_version = "1.3.0"
val ktor_version = "1.6.4"
val kotlin_version = "1.6.10"
val coroutines_version = "1.6.3"
val serialization_version = "1.3.3"
val ktor_version = "2.0.3"

repositories {
mavenCentral()
Expand Down
10 changes: 5 additions & 5 deletions samples/client/petstore/kotlin-allOff-discriminator/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ group 'org.openapitools'
version '1.0.0'

wrapper {
gradleVersion = '6.8.3'
gradleVersion = '7.5'
distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
}

buildscript {
ext.kotlin_version = '1.5.10'
ext.kotlin_version = '1.6.10'

repositories {
maven { url "https://repo1.maven.org/maven2" }
Expand All @@ -30,8 +30,8 @@ test {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
implementation "com.squareup.moshi:moshi-kotlin:1.12.0"
implementation "com.squareup.moshi:moshi-adapters:1.12.0"
implementation "com.squareup.okhttp3:okhttp:4.9.1"
implementation "com.squareup.moshi:moshi-kotlin:1.13.0"
implementation "com.squareup.moshi:moshi-adapters:1.13.0"
implementation "com.squareup.okhttp3:okhttp:4.10.0"
testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
}
8 changes: 4 additions & 4 deletions samples/client/petstore/kotlin-array-simple-string-jvm-okhttp3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ group 'org.openapitools'
version '1.0.0'

wrapper {
gradleVersion = '6.8.3'
gradleVersion = '7.5'
distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
}

buildscript {
ext.kotlin_version = '1.5.10'
ext.kotlin_version = '1.6.10'

repositories {
maven { url "https://repo1.maven.org/maven2" }
Expand All @@ -30,8 +30,8 @@ test {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
implementation "com.squareup.moshi:moshi-kotlin:1.12.0"
implementation "com.squareup.moshi:moshi-adapters:1.12.0"
implementation "com.squareup.moshi:moshi-kotlin:1.13.0"
implementation "com.squareup.moshi:moshi-adapters:1.13.0"
implementation "com.squareup.okhttp3:okhttp:3.12.13"
testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
}
10 changes: 5 additions & 5 deletions samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ group 'org.openapitools'
version '1.0.0'

wrapper {
gradleVersion = '6.8.3'
gradleVersion = '7.5'
distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
}

buildscript {
ext.kotlin_version = '1.5.10'
ext.kotlin_version = '1.6.10'

repositories {
maven { url "https://repo1.maven.org/maven2" }
Expand All @@ -30,8 +30,8 @@ test {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
implementation "com.squareup.moshi:moshi-kotlin:1.12.0"
implementation "com.squareup.moshi:moshi-adapters:1.12.0"
implementation "com.squareup.okhttp3:okhttp:4.9.1"
implementation "com.squareup.moshi:moshi-kotlin:1.13.0"
implementation "com.squareup.moshi:moshi-adapters:1.13.0"
implementation "com.squareup.okhttp3:okhttp:4.10.0"
testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
}
8 changes: 4 additions & 4 deletions samples/client/petstore/kotlin-array-simple-string-multiplatform/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ plugins {
group = "org.openapitools"
version = "1.0.0"

val kotlin_version = "1.6.0"
val coroutines_version = "1.5.2"
val serialization_version = "1.3.0"
val ktor_version = "1.6.4"
val kotlin_version = "1.6.10"
val coroutines_version = "1.6.3"
val serialization_version = "1.3.3"
val ktor_version = "2.0.3"

repositories {
mavenCentral()
Expand Down
8 changes: 4 additions & 4 deletions samples/client/petstore/kotlin-bigdecimal-default-multiplatform/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ plugins {
group = "org.openapitools"
version = "1.0.0"

val kotlin_version = "1.6.0"
val coroutines_version = "1.5.2"
val serialization_version = "1.3.0"
val ktor_version = "1.6.4"
val kotlin_version = "1.6.10"
val coroutines_version = "1.6.3"
val serialization_version = "1.3.3"
val ktor_version = "2.0.3"

repositories {
mavenCentral()
Expand Down
10 changes: 5 additions & 5 deletions samples/client/petstore/kotlin-bigdecimal-default-okhttp4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ group 'org.openapitools'
version '1.0.0'

wrapper {
gradleVersion = '6.8.3'
gradleVersion = '7.5'
distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
}

buildscript {
ext.kotlin_version = '1.5.10'
ext.kotlin_version = '1.6.10'

repositories {
maven { url "https://repo1.maven.org/maven2" }
Expand All @@ -30,8 +30,8 @@ test {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
implementation "com.squareup.moshi:moshi-kotlin:1.12.0"
implementation "com.squareup.moshi:moshi-adapters:1.12.0"
implementation "com.squareup.okhttp3:okhttp:4.9.1"
implementation "com.squareup.moshi:moshi-kotlin:1.13.0"
implementation "com.squareup.moshi:moshi-adapters:1.13.0"
implementation "com.squareup.okhttp3:okhttp:4.10.0"
testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
}
8 changes: 4 additions & 4 deletions samples/client/petstore/kotlin-default-values-jvm-okhttp3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ group 'org.openapitools'
version '1.0.0'

wrapper {
gradleVersion = '6.8.3'
gradleVersion = '7.5'
distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
}

buildscript {
ext.kotlin_version = '1.5.10'
ext.kotlin_version = '1.6.10'

repositories {
maven { url "https://repo1.maven.org/maven2" }
Expand All @@ -30,8 +30,8 @@ test {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
implementation "com.squareup.moshi:moshi-kotlin:1.12.0"
implementation "com.squareup.moshi:moshi-adapters:1.12.0"
implementation "com.squareup.moshi:moshi-kotlin:1.13.0"
implementation "com.squareup.moshi:moshi-adapters:1.13.0"
implementation "com.squareup.okhttp3:okhttp:3.12.13"
testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
}
10 changes: 5 additions & 5 deletions samples/client/petstore/kotlin-default-values-jvm-okhttp4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ group 'org.openapitools'
version '1.0.0'

wrapper {
gradleVersion = '6.8.3'
gradleVersion = '7.5'
distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
}

buildscript {
ext.kotlin_version = '1.5.10'
ext.kotlin_version = '1.6.10'

repositories {
maven { url "https://repo1.maven.org/maven2" }
Expand All @@ -30,8 +30,8 @@ test {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
implementation "com.squareup.moshi:moshi-kotlin:1.12.0"
implementation "com.squareup.moshi:moshi-adapters:1.12.0"
implementation "com.squareup.okhttp3:okhttp:4.9.1"
implementation "com.squareup.moshi:moshi-kotlin:1.13.0"
implementation "com.squareup.moshi:moshi-adapters:1.13.0"
implementation "com.squareup.okhttp3:okhttp:4.10.0"
testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
}
10 changes: 5 additions & 5 deletions samples/client/petstore/kotlin-default-values-jvm-retrofit2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ group 'org.openapitools'
version '1.0.0'

wrapper {
gradleVersion = '6.8.3'
gradleVersion = '7.5'
distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
}

buildscript {
ext.kotlin_version = '1.5.10'
ext.kotlin_version = '1.6.10'
ext.retrofitVersion = '2.9.0'

repositories {
Expand All @@ -31,9 +31,9 @@ test {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
implementation "com.squareup.moshi:moshi-kotlin:1.12.0"
implementation "com.squareup.moshi:moshi-adapters:1.12.0"
implementation "com.squareup.okhttp3:logging-interceptor:4.9.1"
implementation "com.squareup.moshi:moshi-kotlin:1.13.0"
implementation "com.squareup.moshi:moshi-adapters:1.13.0"
implementation "com.squareup.okhttp3:logging-interceptor:4.10.0"
implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
implementation "com.squareup.retrofit2:converter-moshi:$retrofitVersion"
implementation "com.squareup.retrofit2:converter-scalars:$retrofitVersion"
Expand Down
8 changes: 4 additions & 4 deletions samples/client/petstore/kotlin-default-values-multiplatform/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ plugins {
group = "org.openapitools"
version = "1.0.0"

val kotlin_version = "1.6.0"
val coroutines_version = "1.5.2"
val serialization_version = "1.3.0"
val ktor_version = "1.6.4"
val kotlin_version = "1.6.10"
val coroutines_version = "1.6.3"
val serialization_version = "1.3.3"
val ktor_version = "2.0.3"

repositories {
mavenCentral()
Expand Down
10 changes: 5 additions & 5 deletions samples/client/petstore/kotlin-enum-default-value/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ group 'org.openapitools'
version '1.0.0'

wrapper {
gradleVersion = '6.8.3'
gradleVersion = '7.5'
distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
}

buildscript {
ext.kotlin_version = '1.5.10'
ext.kotlin_version = '1.6.10'

repositories {
maven { url "https://repo1.maven.org/maven2" }
Expand All @@ -30,8 +30,8 @@ test {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
implementation "com.squareup.moshi:moshi-kotlin:1.12.0"
implementation "com.squareup.moshi:moshi-adapters:1.12.0"
implementation "com.squareup.okhttp3:okhttp:4.9.1"
implementation "com.squareup.moshi:moshi-kotlin:1.13.0"
implementation "com.squareup.moshi:moshi-adapters:1.13.0"
implementation "com.squareup.okhttp3:okhttp:4.10.0"
testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
}
8 changes: 4 additions & 4 deletions samples/client/petstore/kotlin-gson/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ group 'org.openapitools'
version '1.0.0'

wrapper {
gradleVersion = '6.8.3'
gradleVersion = '7.5'
distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
}

buildscript {
ext.kotlin_version = '1.5.10'
ext.kotlin_version = '1.6.10'

repositories {
maven { url "https://repo1.maven.org/maven2" }
Expand All @@ -29,7 +29,7 @@ test {

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "com.google.code.gson:gson:2.8.7"
implementation "com.squareup.okhttp3:okhttp:4.9.1"
implementation "com.google.code.gson:gson:2.9.0"
implementation "com.squareup.okhttp3:okhttp:4.10.0"
testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
}
Loading