From 038c75b648f26d53f4ff53228acb8ef6839b4434 Mon Sep 17 00:00:00 2001 From: Adam Kaplan Date: Tue, 3 Mar 2020 13:17:11 -0500 Subject: [PATCH] Remove newline in generated build.gradle files --- .../resources/kotlin-client/build.gradle.mustache | 12 ++++++++---- samples/client/petstore/kotlin-gson/build.gradle | 1 - samples/client/petstore/kotlin-jackson/build.gradle | 1 - .../petstore/kotlin-json-request-string/build.gradle | 1 - .../petstore/kotlin-moshi-codegen/build.gradle | 1 - .../client/petstore/kotlin-nonpublic/build.gradle | 1 - samples/client/petstore/kotlin-nullable/build.gradle | 1 - samples/client/petstore/kotlin-okhttp3/build.gradle | 1 - samples/client/petstore/kotlin-string/build.gradle | 1 - .../client/petstore/kotlin-threetenbp/build.gradle | 1 - samples/client/petstore/kotlin/build.gradle | 1 - 11 files changed, 8 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 23379c05bdab..82a624d47005 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 @@ -58,18 +58,22 @@ dependencies { {{^moshi}} compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" {{/moshi}} - {{#moshi}}{{#modeCodeGen}} + {{#moshi}} + {{#modeCodeGen}} compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - {{/modeCodeGen}}{{/moshi}} + {{/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}} + {{#moshi}} + {{#modeCodeGen}} compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - {{/modeCodeGen}}{{/moshi}} + {{/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 d96117b408de..ce9cb568dd7b 100644 --- a/samples/client/petstore/kotlin-gson/build.gradle +++ b/samples/client/petstore/kotlin-gson/build.gradle @@ -31,7 +31,6 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$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 942e6bded3b7..c76aad33ca32 100644 --- a/samples/client/petstore/kotlin-jackson/build.gradle +++ b/samples/client/petstore/kotlin-jackson/build.gradle @@ -33,7 +33,6 @@ dependencies { 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-json-request-string/build.gradle b/samples/client/petstore/kotlin-json-request-string/build.gradle index 9a4f4c340693..56be0bd0dd87 100644 --- a/samples/client/petstore/kotlin-json-request-string/build.gradle +++ b/samples/client/petstore/kotlin-json-request-string/build.gradle @@ -32,7 +32,6 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" compile "com.squareup.moshi:moshi-kotlin:1.9.2" compile "com.squareup.moshi:moshi-adapters:1.9.2" - 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 ca8c84f14de4..6b949799c398 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/build.gradle +++ b/samples/client/petstore/kotlin-moshi-codegen/build.gradle @@ -33,7 +33,6 @@ dependencies { 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" - compile "com.squareup.okhttp3:okhttp:4.2.2" testCompile "io.kotlintest:kotlintest-runner-junit5:3.1.0" } diff --git a/samples/client/petstore/kotlin-nonpublic/build.gradle b/samples/client/petstore/kotlin-nonpublic/build.gradle index 9a4f4c340693..56be0bd0dd87 100644 --- a/samples/client/petstore/kotlin-nonpublic/build.gradle +++ b/samples/client/petstore/kotlin-nonpublic/build.gradle @@ -32,7 +32,6 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" compile "com.squareup.moshi:moshi-kotlin:1.9.2" compile "com.squareup.moshi:moshi-adapters:1.9.2" - compile "com.squareup.okhttp3:okhttp:4.2.2" testCompile "io.kotlintest:kotlintest-runner-junit5:3.1.0" } diff --git a/samples/client/petstore/kotlin-nullable/build.gradle b/samples/client/petstore/kotlin-nullable/build.gradle index 9a4f4c340693..56be0bd0dd87 100644 --- a/samples/client/petstore/kotlin-nullable/build.gradle +++ b/samples/client/petstore/kotlin-nullable/build.gradle @@ -32,7 +32,6 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" compile "com.squareup.moshi:moshi-kotlin:1.9.2" compile "com.squareup.moshi:moshi-adapters:1.9.2" - compile "com.squareup.okhttp3:okhttp:4.2.2" testCompile "io.kotlintest:kotlintest-runner-junit5:3.1.0" } diff --git a/samples/client/petstore/kotlin-okhttp3/build.gradle b/samples/client/petstore/kotlin-okhttp3/build.gradle index a89177b0a606..662c2a62ce34 100644 --- a/samples/client/petstore/kotlin-okhttp3/build.gradle +++ b/samples/client/petstore/kotlin-okhttp3/build.gradle @@ -32,7 +32,6 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" compile "com.squareup.moshi:moshi-kotlin:1.9.2" compile "com.squareup.moshi:moshi-adapters:1.9.2" - compile "com.squareup.okhttp3:okhttp:3.12.6" testCompile "io.kotlintest:kotlintest-runner-junit5:3.1.0" } diff --git a/samples/client/petstore/kotlin-string/build.gradle b/samples/client/petstore/kotlin-string/build.gradle index 9a4f4c340693..56be0bd0dd87 100644 --- a/samples/client/petstore/kotlin-string/build.gradle +++ b/samples/client/petstore/kotlin-string/build.gradle @@ -32,7 +32,6 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" compile "com.squareup.moshi:moshi-kotlin:1.9.2" compile "com.squareup.moshi:moshi-adapters:1.9.2" - compile "com.squareup.okhttp3:okhttp:4.2.2" testCompile "io.kotlintest:kotlintest-runner-junit5:3.1.0" } diff --git a/samples/client/petstore/kotlin-threetenbp/build.gradle b/samples/client/petstore/kotlin-threetenbp/build.gradle index ebf3a9f32375..886101b0fbef 100644 --- a/samples/client/petstore/kotlin-threetenbp/build.gradle +++ b/samples/client/petstore/kotlin-threetenbp/build.gradle @@ -32,7 +32,6 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" compile "com.squareup.moshi:moshi-kotlin:1.9.2" compile "com.squareup.moshi:moshi-adapters:1.9.2" - compile "com.squareup.okhttp3:okhttp:4.2.2" compile "org.threeten:threetenbp:1.4.0" testCompile "io.kotlintest:kotlintest-runner-junit5:3.1.0" diff --git a/samples/client/petstore/kotlin/build.gradle b/samples/client/petstore/kotlin/build.gradle index 9a4f4c340693..56be0bd0dd87 100644 --- a/samples/client/petstore/kotlin/build.gradle +++ b/samples/client/petstore/kotlin/build.gradle @@ -32,7 +32,6 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" compile "com.squareup.moshi:moshi-kotlin:1.9.2" compile "com.squareup.moshi:moshi-adapters:1.9.2" - compile "com.squareup.okhttp3:okhttp:4.2.2" testCompile "io.kotlintest:kotlintest-runner-junit5:3.1.0" }