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}")
def generateJsonModelsTask = tasks.create("apiGenerator${variant.name}") doLast {
def jarArgs = new ArrayList<String>()
jarArgs.add(configurations.apigenerator.asPath)
jarArgs.add("generate-client-code")
jarArgs.add("--output-language")
jarArgs.add("JAVA")
jarArgs.add("--specification-path")
jarArgs.add(rootProject.extensions.findByName("pathToApiSchemes"))
jarArgs.add("--output-path")
jarArgs.add("${generatedModelsDirectory.path}")
jarArgs.add("--package-name")
jarArgs.add("${rootProject.extensions.findByName("applicationId") ?: applicationId}")
javaexec { main = "-jar"; args = jarArgs; workingDir = file("${rootDir}") }
javaexec {
main = "-jar"
workingDir = file("${rootDir}")
args = [
configurations.apigenerator.asPath,
"generate-client-code",
"--output-language",
"JAVA",
"--specification-path",
rootProject.extensions.findByName("pathToApiSchemes"),
"--output-path",
"${generatedModelsDirectory.path}",
"--package-name",
"${rootProject.extensions.findByName("applicationId") ?: applicationId}"
]
}
}
generateJsonModelsTask.description = 'Generates Java classes for JSON models'

View File

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