From 36e68476461cf0a0c2708ed9f9f61d7a743fd925 Mon Sep 17 00:00:00 2001
From: Daniil Borisovskii <vender98@mail.ru>
Date: Fri, 29 May 2020 19:04:45 +0300
Subject: [PATCH] Make "apiGenerator" a separate task instead of binding it to
 android.applicationVariants

---
 gradle/apiGenerator.gradle | 41 ++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/gradle/apiGenerator.gradle b/gradle/apiGenerator.gradle
index d7b90fe..60a96bf 100644
--- a/gradle/apiGenerator.gradle
+++ b/gradle/apiGenerator.gradle
@@ -15,28 +15,25 @@ dependencies {
     apigenerator 'ru.touchin:api-generator:1.4.0-beta1'
 }
 
-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")
 
-    def generateJsonModelsTask = tasks.create("apiGenerator${variant.name}") doLast {
-        javaexec {
-            main = "-jar"
-            workingDir = file("${rootDir}")
-            args = [
-                    configurations.apigenerator.asPath,
-                    "generate-client-code",
-                    "--output-language",
-                    "KOTLIN",
-                    "--specification-path",
-                    rootProject.extensions.findByName("pathToApiSchemes"),
-                    "--output-path",
-                    "${generatedModelsDirectory.path}",
-                    "--package-name",
-                    "${rootProject.extensions.findByName("applicationId") ?: applicationId}"
-            ]
-        }
+def generateJsonModelsTask = tasks.create("apiGenerator") doLast {
+    javaexec {
+        main = "-jar"
+        workingDir = file("${rootDir}")
+        args = [
+                configurations.apigenerator.asPath,
+                "generate-client-code",
+                "--output-language",
+                "KOTLIN",
+                "--specification-path",
+                rootProject.extensions.findByName("pathToApiSchemes"),
+                "--output-path",
+                "${generatedModelsDirectory.path}",
+                "--package-name",
+                "${rootProject.extensions.findByName("applicationId")}"
+        ]
     }
-
-    generateJsonModelsTask.description = 'Generates Java classes for JSON models'
-    variant.registerJavaGeneratingTask generateJsonModelsTask, generatedModelsDirectory
 }
+
+generateJsonModelsTask.description = 'Generates Java classes for JSON models'