TouchInstinct
/
BuildScripts
304
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

Merge pull request #193 from TouchInstinct/feature/fix-apiGenerator-for-gradle-6.3 

Fix api generator for gradle 6.3
This commit is contained in:
Vladimir Shefer 2020-05-24 12:54:12 +03:00 committed by GitHub
parent ea14358a2e e9b619df87
commit 73f21b9cc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gradle/apiGenerator.gradle
View File

@ -1,5 +1,10 @@
repositories {
maven { url "http://dl.bintray.com/touchin/touchin-tools" }
maven {
url 'https://dl.bintray.com/touchin/touchin-tools'
metadataSources {
artifact()
}
}
}
configurations {
@ -14,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'

41
gradle/apiGeneratorKotlinServer.gradle
View File

@ -1,5 +1,10 @@
repositories {
maven { url "http://dl.bintray.com/touchin/touchin-tools" }
maven {
url "https://dl.bintray.com/touchin/touchin-tools"
metadataSources {
artifact()
}
}
}
configurations {
@ -7,23 +12,27 @@ configurations {
}
dependencies {
apigeneratorKotlinServer 'ru.touchin:api-generator:1.4.0-alpha1'
apigeneratorKotlinServer 'ru.touchin:api-generator:1.4.0-beta1'
}
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
]
}
}