From 9c06bb0b64b294a4f9bbb51e4f6e4cd2c0eda428 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Fri, 25 May 2018 22:49:13 +0300
Subject: [PATCH] Deprecation fix

---
 gradle/apiGenerator.gradle         | 37 +++++++++++++++---------------
 gradle/commonStaticAnalysis.gradle |  2 +-
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/gradle/apiGenerator.gradle b/gradle/apiGenerator.gradle
index 22e3837..47ff181 100644
--- a/gradle/apiGenerator.gradle
+++ b/gradle/apiGenerator.gradle
@@ -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
 }
diff --git a/gradle/commonStaticAnalysis.gradle b/gradle/commonStaticAnalysis.gradle
index 146faad..9c104af 100644
--- a/gradle/commonStaticAnalysis.gradle
+++ b/gradle/commonStaticAnalysis.gradle
@@ -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