loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[Kotlin] Remove kotlin-reflect dependency when not needed (#5502)

Browse Source 
* Remove kotlin-reflect dependency when using CodeGen

* Update Kotlin tests

* Regenerated unit test samples

* Remove newline in generated build.gradle files
This commit is contained in:
Adam 2020-03-17 09:24:14 -04:00 committed by GitHub
parent 32e4361822
commit 47e24af369
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache vendored
View File

@ -35,9 +35,9 @@ test {
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
{{#moshi}} {{#moshi}}
{{^moshiCodeGen}} {{^moshiCodeGen}}
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
compile "com.squareup.moshi:moshi-kotlin:1.9.2" compile "com.squareup.moshi:moshi-kotlin:1.9.2"
{{/moshiCodeGen}} {{/moshiCodeGen}}
compile "com.squareup.moshi:moshi-adapters:1.9.2" compile "com.squareup.moshi:moshi-adapters:1.9.2"
@ -55,9 +55,25 @@ dependencies {
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.2" compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.2"
{{/jackson}} {{/jackson}}
{{#jvm-okhttp3}} {{#jvm-okhttp3}}
{{^moshi}}
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
{{/moshi}}
{{#moshi}}
{{#modeCodeGen}}
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
{{/modeCodeGen}}
{{/moshi}}
compile "com.squareup.okhttp3:okhttp:3.12.6" compile "com.squareup.okhttp3:okhttp:3.12.6"
{{/jvm-okhttp3}} {{/jvm-okhttp3}}
{{#jvm-okhttp4}} {{#jvm-okhttp4}}
{{^moshi}}
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
{{/moshi}}
{{#moshi}}
{{#modeCodeGen}}
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
{{/modeCodeGen}}
{{/moshi}}
compile "com.squareup.okhttp3:okhttp:4.2.2" compile "com.squareup.okhttp3:okhttp:4.2.2"
{{/jvm-okhttp4}} {{/jvm-okhttp4}}
{{#threetenbp}} {{#threetenbp}}

2
samples/client/petstore/kotlin-gson/build.gradle
View File

@ -29,8 +29,8 @@ test {
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
compile "com.google.code.gson:gson:2.8.6" compile "com.google.code.gson:gson:2.8.6"
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
compile "com.squareup.okhttp3:okhttp:4.2.2" compile "com.squareup.okhttp3:okhttp:4.2.2"
testCompile "io.kotlintest:kotlintest-runner-junit5:3.1.0" testCompile "io.kotlintest:kotlintest-runner-junit5:3.1.0"
} }

2
samples/client/petstore/kotlin-jackson/build.gradle
View File

@ -29,10 +29,10 @@ test {
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
compile "com.fasterxml.jackson.module:jackson-module-kotlin:2.10.2" compile "com.fasterxml.jackson.module:jackson-module-kotlin:2.10.2"
compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.2" compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.2"
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.2" compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.2"
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
compile "com.squareup.okhttp3:okhttp:4.2.2" compile "com.squareup.okhttp3:okhttp:4.2.2"
testCompile "io.kotlintest:kotlintest-runner-junit5:3.1.0" testCompile "io.kotlintest:kotlintest-runner-junit5:3.1.0"
} }

1
samples/client/petstore/kotlin-moshi-codegen/build.gradle
View File

@ -30,7 +30,6 @@ test {
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
compile "com.squareup.moshi:moshi-adapters:1.9.2" compile "com.squareup.moshi:moshi-adapters:1.9.2"
compile "com.squareup.moshi:moshi:1.9.2" compile "com.squareup.moshi:moshi:1.9.2"
kapt "com.squareup.moshi:moshi-kotlin-codegen:1.9.2" kapt "com.squareup.moshi:moshi-kotlin-codegen:1.9.2"