Refactoring in apiGenerator scripts

This commit is contained in:
Vladimir Shefer 2020-05-22 21:17:00 +03:00
parent 9d35018021
commit e9b619df87
2 changed files with 34 additions and 26 deletions

View File

@ -19,18 +19,22 @@ android.applicationVariants.all { variant ->
final File generatedModelsDirectory = new File("${project.buildDir}/generated/source/models/${variant.dirName}") final File generatedModelsDirectory = new File("${project.buildDir}/generated/source/models/${variant.dirName}")
def generateJsonModelsTask = tasks.create("apiGenerator${variant.name}") doLast { def generateJsonModelsTask = tasks.create("apiGenerator${variant.name}") doLast {
def jarArgs = new ArrayList<String>() javaexec {
jarArgs.add(configurations.apigenerator.asPath) main = "-jar"
jarArgs.add("generate-client-code") workingDir = file("${rootDir}")
jarArgs.add("--output-language") args = [
jarArgs.add("JAVA") configurations.apigenerator.asPath,
jarArgs.add("--specification-path") "generate-client-code",
jarArgs.add(rootProject.extensions.findByName("pathToApiSchemes")) "--output-language",
jarArgs.add("--output-path") "JAVA",
jarArgs.add("${generatedModelsDirectory.path}") "--specification-path",
jarArgs.add("--package-name") rootProject.extensions.findByName("pathToApiSchemes"),
jarArgs.add("${rootProject.extensions.findByName("applicationId") ?: applicationId}") "--output-path",
javaexec { main = "-jar"; args = jarArgs; workingDir = file("${rootDir}") } "${generatedModelsDirectory.path}",
"--package-name",
"${rootProject.extensions.findByName("applicationId") ?: applicationId}"
]
}
} }
generateJsonModelsTask.description = 'Generates Java classes for JSON models' generateJsonModelsTask.description = 'Generates Java classes for JSON models'

View File

@ -16,19 +16,23 @@ dependencies {
} }
task generateApiModelsKotlinServer doLast { task generateApiModelsKotlinServer doLast {
def jarArgs = new ArrayList<String>() javaexec {
jarArgs.add(configurations.apigeneratorKotlinServer.asPath) main = "-jar"
jarArgs.add("generate-client-code") workingDir = file("${rootDir}")
jarArgs.add("--output-language") args = [
jarArgs.add("KOTLIN_SERVER") configurations.apigeneratorKotlinServer.asPath,
jarArgs.add("--specification-path") "generate-client-code",
jarArgs.add(rootProject.extensions.findByName("pathToApiSchemes")) "--output-language",
jarArgs.add("--output-path") "KOTLIN_SERVER",
jarArgs.add("${rootDir}/src/main/kotlin") "--specification-path",
jarArgs.add("--package-name") rootProject.extensions.findByName("pathToApiSchemes"),
jarArgs.add(rootProject.extensions.findByName("apiPackageName")) "--output-path",
jarArgs.add("--recreate_output_dirs") "${rootDir}/src/main/kotlin",
jarArgs.add(false) "--package-name",
javaexec { main = "-jar"; args = jarArgs; workingDir = file("${rootDir}") } rootProject.extensions.findByName("apiPackageName"),
"--recreate_output_dirs",
false
]
}
} }