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

Merge pull request #57 from TouchInstinct/deprecation_fix 

Deprecation fix
This commit is contained in:
Denis Karmyshakov 2018-05-29 15:30:01 +03:00 committed by GitHub
parent 622b2d3450 9c06bb0b64
commit 0851730ecb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gradle/apiGenerator.gradle
View File

@ -10,25 +10,24 @@ dependencies {
apigenerator 'ru.touchin:api-generator:1.1.20'
}
android.applicationVariants.all {
variant ->
final File generatedModelsDirectory = new File("${project.buildDir}/generated/source/models/${variant.dirName}")
android.applicationVariants.all { variant ->
final File generatedModelsDirectory = new File("${project.buildDir}/generated/source/models/${variant.dirName}")
def generateJsonModelsTask = tasks.create("apiGenerator${variant.name}") << {
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("${applicationId}")
javaexec { main = "-jar"; args = jarArgs; workingDir = file("${rootDir}") }
}
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("${applicationId}")
javaexec { main = "-jar"; args = jarArgs; workingDir = file("${rootDir}") }
}
generateJsonModelsTask.description = 'Generates Java classes for JSON models'
variant.registerJavaGeneratingTask generateJsonModelsTask, generatedModelsDirectory
generateJsonModelsTask.description = 'Generates Java classes for JSON models'
variant.registerJavaGeneratingTask generateJsonModelsTask, generatedModelsDirectory
}

2
gradle/commonStaticAnalysis.gradle
View File

@ -34,7 +34,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
ext.getIdeaFormatTask = { isAndroidProject, sources ->
def ideaPath = System.getenv("IDEA_HOME")
if (ideaPath == null) {
return tasks.create((isAndroidProject ? "android" : "server") + "do nothing")
return tasks.create((isAndroidProject ? "android" : "server") + "donothing")
}
return tasks.create((isAndroidProject ? "android" : "server") + "IdeaFormat_$project.name", Exec) {
def inspectionPath