From f8e95262d299e5a7a3e022b504411d16c47124d5 Mon Sep 17 00:00:00 2001 From: Elena Bobkova Date: Thu, 27 Jun 2019 15:21:47 +0300 Subject: [PATCH 1/4] kotlin server models gen started --- gradle/apiGeneratorKotlinServer.gradle | 27 ++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 gradle/apiGeneratorKotlinServer.gradle diff --git a/gradle/apiGeneratorKotlinServer.gradle b/gradle/apiGeneratorKotlinServer.gradle new file mode 100644 index 0000000..4393bd5 --- /dev/null +++ b/gradle/apiGeneratorKotlinServer.gradle @@ -0,0 +1,27 @@ +repositories { + maven { url "http://dl.bintray.com/touchin/touchin-tools" } +} + +configurations { + apigenerator +} + +dependencies { + apigenerator 'ru.touchin:api-generator:1.3' +} + +task apiGeneratorKotlinServer doLast { + def jarArgs = new ArrayList() + jarArgs.add(configurations.apigenerator.asPath) + jarArgs.add("generate-client-code") + jarArgs.add("--output-language") + jarArgs.add("KOTLIN_SERVER") + jarArgs.add("--specification-path") + jarArgs.add(rootProject.extensions.findByName("pathToApiSchemes")) + jarArgs.add("--output-path") + jarArgs.add("${rootDir}/src/main/generated") + jarArgs.add("--package-name") + jarArgs.add(rootProject.extensions.findByName("apiPackageName")) + javaexec { main = "-jar"; args = jarArgs; workingDir = file("${rootDir}") } +} + From 1631d62bfe4e6dc29d9674a4479e38886a21ab69 Mon Sep 17 00:00:00 2001 From: Elena Bobkova Date: Fri, 28 Jun 2019 14:09:18 +0300 Subject: [PATCH 2/4] fixed output directory path --- gradle/apiGeneratorKotlinServer.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gradle/apiGeneratorKotlinServer.gradle b/gradle/apiGeneratorKotlinServer.gradle index 4393bd5..02043e6 100644 --- a/gradle/apiGeneratorKotlinServer.gradle +++ b/gradle/apiGeneratorKotlinServer.gradle @@ -19,9 +19,11 @@ task apiGeneratorKotlinServer doLast { jarArgs.add("--specification-path") jarArgs.add(rootProject.extensions.findByName("pathToApiSchemes")) jarArgs.add("--output-path") - jarArgs.add("${rootDir}/src/main/generated") + jarArgs.add("${rootDir}/src/main/kotlin") jarArgs.add("--package-name") jarArgs.add(rootProject.extensions.findByName("apiPackageName")) + jarArgs.add("--recreate_output_dirs") + jarArgs.add(false) javaexec { main = "-jar"; args = jarArgs; workingDir = file("${rootDir}") } } From de3098db588bf7fa70a11161402a0c3686214106 Mon Sep 17 00:00:00 2001 From: Elena Bobkova Date: Fri, 28 Jun 2019 15:35:54 +0300 Subject: [PATCH 3/4] api generator version updated --- gradle/apiGeneratorKotlinServer.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/apiGeneratorKotlinServer.gradle b/gradle/apiGeneratorKotlinServer.gradle index 02043e6..e324dcb 100644 --- a/gradle/apiGeneratorKotlinServer.gradle +++ b/gradle/apiGeneratorKotlinServer.gradle @@ -7,7 +7,7 @@ configurations { } dependencies { - apigenerator 'ru.touchin:api-generator:1.3' + apigenerator 'ru.touchin:api-generator:1.3.1' } task apiGeneratorKotlinServer doLast { From c9f31d9e3d4fbb5d8411fa01e1d2d14a30772a5c Mon Sep 17 00:00:00 2001 From: Elena Bobkova Date: Fri, 28 Jun 2019 15:40:30 +0300 Subject: [PATCH 4/4] configuration name updated --- gradle/apiGeneratorKotlinServer.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/apiGeneratorKotlinServer.gradle b/gradle/apiGeneratorKotlinServer.gradle index e324dcb..1e9aa90 100644 --- a/gradle/apiGeneratorKotlinServer.gradle +++ b/gradle/apiGeneratorKotlinServer.gradle @@ -3,16 +3,16 @@ repositories { } configurations { - apigenerator + apigeneratorKotlinServer } dependencies { - apigenerator 'ru.touchin:api-generator:1.3.1' + apigeneratorKotlinServer 'ru.touchin:api-generator:1.3.1' } -task apiGeneratorKotlinServer doLast { +task generateApiModelsKotlinServer doLast { def jarArgs = new ArrayList() - jarArgs.add(configurations.apigenerator.asPath) + jarArgs.add(configurations.apigeneratorKotlinServer.asPath) jarArgs.add("generate-client-code") jarArgs.add("--output-language") jarArgs.add("KOTLIN_SERVER")