From e1726f0434e35b508039f6393bf277a7427dbb8e Mon Sep 17 00:00:00 2001
From: Vladimir Shefer <quameu@gmail.com>
Date: Fri, 22 May 2020 21:15:58 +0300
Subject: [PATCH 1/3] Make apiGenerator repo compatible with gradle 6.+

---
 gradle/apiGenerator.gradle             | 7 ++++++-
 gradle/apiGeneratorKotlinServer.gradle | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/gradle/apiGenerator.gradle b/gradle/apiGenerator.gradle
index e8f08af..66bd565 100644
--- a/gradle/apiGenerator.gradle
+++ b/gradle/apiGenerator.gradle
@@ -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 {
diff --git a/gradle/apiGeneratorKotlinServer.gradle b/gradle/apiGeneratorKotlinServer.gradle
index 2f98ab0..6c0229d 100644
--- a/gradle/apiGeneratorKotlinServer.gradle
+++ b/gradle/apiGeneratorKotlinServer.gradle
@@ -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 {

From 9d35018021559eb721581470d86c7104084bab8e Mon Sep 17 00:00:00 2001
From: Vladimir Shefer <quameu@gmail.com>
Date: Fri, 22 May 2020 21:16:22 +0300
Subject: [PATCH 2/3] Update version of apiGenerator for kotlin server

---
 gradle/apiGeneratorKotlinServer.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/apiGeneratorKotlinServer.gradle b/gradle/apiGeneratorKotlinServer.gradle
index 6c0229d..8fc0d6c 100644
--- a/gradle/apiGeneratorKotlinServer.gradle
+++ b/gradle/apiGeneratorKotlinServer.gradle
@@ -12,7 +12,7 @@ configurations {
 }
 
 dependencies {
-    apigeneratorKotlinServer 'ru.touchin:api-generator:1.4.0-alpha1'
+    apigeneratorKotlinServer 'ru.touchin:api-generator:1.4.0-beta1'
 }
 
 task generateApiModelsKotlinServer doLast {

From e9b619df87ae396ba8ff731771280cfdff9fa569 Mon Sep 17 00:00:00 2001
From: Vladimir Shefer <quameu@gmail.com>
Date: Fri, 22 May 2020 21:17:00 +0300
Subject: [PATCH 3/3] Refactoring in apiGenerator scripts

---
 gradle/apiGenerator.gradle             | 28 ++++++++++++----------
 gradle/apiGeneratorKotlinServer.gradle | 32 +++++++++++++++-----------
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/gradle/apiGenerator.gradle b/gradle/apiGenerator.gradle
index 66bd565..12eac76 100644
--- a/gradle/apiGenerator.gradle
+++ b/gradle/apiGenerator.gradle
@@ -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'
diff --git a/gradle/apiGeneratorKotlinServer.gradle b/gradle/apiGeneratorKotlinServer.gradle
index 8fc0d6c..66676b5 100644
--- a/gradle/apiGeneratorKotlinServer.gradle
+++ b/gradle/apiGeneratorKotlinServer.gradle
@@ -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
+        ]
+    }
 }