From 47e24af3694770dbddfc00b40c4d9bb049d28982 Mon Sep 17 00:00:00 2001
From: Adam <adkapx@gmail.com>
Date: Tue, 17 Mar 2020 09:24:14 -0400
Subject: [PATCH] [Kotlin] Remove kotlin-reflect dependency when not needed
 (#5502)

* Remove kotlin-reflect dependency when using CodeGen

* Update Kotlin tests

* Regenerated unit test samples

* Remove newline in generated build.gradle files
---
 .../kotlin-client/build.gradle.mustache        | 18 +++++++++++++++++-
 .../client/petstore/kotlin-gson/build.gradle   |  2 +-
 .../petstore/kotlin-jackson/build.gradle       |  2 +-
 .../petstore/kotlin-moshi-codegen/build.gradle |  1 -
 4 files changed, 19 insertions(+), 4 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 31b844fd30c..82a624d4700 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
@@ -35,9 +35,9 @@ test {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     {{#moshi}}
     {{^moshiCodeGen}}
+    compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     compile "com.squareup.moshi:moshi-kotlin:1.9.2"
     {{/moshiCodeGen}}
     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"
     {{/jackson}}
     {{#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"
     {{/jvm-okhttp3}}
     {{#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"
     {{/jvm-okhttp4}}
     {{#threetenbp}}
diff --git a/samples/client/petstore/kotlin-gson/build.gradle b/samples/client/petstore/kotlin-gson/build.gradle
index b47c9398242..ce9cb568dd7 100644
--- a/samples/client/petstore/kotlin-gson/build.gradle
+++ b/samples/client/petstore/kotlin-gson/build.gradle
@@ -29,8 +29,8 @@ test {
 
 dependencies {
     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 "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     compile "com.squareup.okhttp3:okhttp:4.2.2"
     testCompile "io.kotlintest:kotlintest-runner-junit5:3.1.0"
 }
diff --git a/samples/client/petstore/kotlin-jackson/build.gradle b/samples/client/petstore/kotlin-jackson/build.gradle
index 13a4b140768..c76aad33ca3 100644
--- a/samples/client/petstore/kotlin-jackson/build.gradle
+++ b/samples/client/petstore/kotlin-jackson/build.gradle
@@ -29,10 +29,10 @@ test {
 
 dependencies {
     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.datatype:jackson-datatype-jdk8: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"
     testCompile "io.kotlintest:kotlintest-runner-junit5:3.1.0"
 }
diff --git a/samples/client/petstore/kotlin-moshi-codegen/build.gradle b/samples/client/petstore/kotlin-moshi-codegen/build.gradle
index 3790ead2794..6b949799c39 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/build.gradle
+++ b/samples/client/petstore/kotlin-moshi-codegen/build.gradle
@@ -30,7 +30,6 @@ test {
 
 dependencies {
     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:1.9.2"
     kapt "com.squareup.moshi:moshi-kotlin-codegen:1.9.2"