From 1d04958271220d0c0708d6cb373a5752ddaba662 Mon Sep 17 00:00:00 2001
From: Victor Shabanov <shabanov.dev.git@gmail.com>
Date: Thu, 17 Oct 2019 15:42:36 +0300
Subject: [PATCH 1/5] Change api generation and localization scripts to work
 with swift modules

---
 xcode/aux_scripts/import_strings.php | 4 ++--
 xcode/build_phases/api_generator.sh  | 2 +-
 xcode/build_phases/localization.sh   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xcode/aux_scripts/import_strings.php b/xcode/aux_scripts/import_strings.php
index 911e989..814928a 100644
--- a/xcode/aux_scripts/import_strings.php
+++ b/xcode/aux_scripts/import_strings.php
@@ -1,5 +1,5 @@
 <?php
-    $PROJECT_NAME = $argv[1];
+    $PRODUCT_NAME = $argv[1];
     $COMMON_STRINGS_PATH = $argv[2];
 
     function createFolder($path) {
@@ -8,7 +8,7 @@
         }
     }
 
-    $localization = './'.$PROJECT_NAME.'/Resources/Localization/';
+    $localization = './'.$PRODUCT_NAME.'/Resources/Localization/';
 
     $baseFile = file_get_contents(array_pop(glob($COMMON_STRINGS_PATH.'/default*.json')));
     $baseJson = json_decode($baseFile, true);
diff --git a/xcode/build_phases/api_generator.sh b/xcode/build_phases/api_generator.sh
index 552a538..a16d254 100644
--- a/xcode/build_phases/api_generator.sh
+++ b/xcode/build_phases/api_generator.sh
@@ -6,4 +6,4 @@ link="https://dl.bintray.com/touchin/touchin-tools/ru/touchin/api-generator/${VE
 . build-scripts/xcode/aux_scripts/download_file.sh ${FILE_NAME} ${link}
 
 # execute api generator
-java -jar "Downloads/${FILE_NAME}" generate-client-code --output-language SWIFT --specification-path common/api --output-path ${PROJECT_NAME}/Generated --single-file true
+java -jar "Downloads/${FILE_NAME}" generate-client-code --output-language SWIFT --specification-path common/api --output-path ${PRODUCT_NAME}/Generated --single-file true
diff --git a/xcode/build_phases/localization.sh b/xcode/build_phases/localization.sh
index e363844..8c8bf61 100644
--- a/xcode/build_phases/localization.sh
+++ b/xcode/build_phases/localization.sh
@@ -1,4 +1,4 @@
-LOCALIZATION_PATH="${PROJECT_NAME}/Resources/Localization"
+LOCALIZATION_PATH="${PRODUCT_NAME}/Resources/Localization"
 #first argument set strings folder path
 STRINGS_FOLDER=${1:-"common/strings"}
 
@@ -13,4 +13,4 @@ if ! [ -e "${PROJECT_DIR}/${STRINGS_FOLDER}" ]; then
 fi
 
 #second argument set strings script path
-php ${2:-build-scripts/xcode/aux_scripts/import_strings.php} ${PROJECT_NAME} ${STRINGS_FOLDER}
+php ${2:-build-scripts/xcode/aux_scripts/import_strings.php} ${PRODUCT_NAME} ${STRINGS_FOLDER}

From 9e270928d532d8c40dcabafd149736b34075a30e Mon Sep 17 00:00:00 2001
From: Victor Shabanov <shabanov.dev.git@gmail.com>
Date: Thu, 17 Oct 2019 15:50:28 +0300
Subject: [PATCH 2/5] Fix localization NSLocalizedString static values
 visibility

---
 xcode/aux_scripts/import_strings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xcode/aux_scripts/import_strings.php b/xcode/aux_scripts/import_strings.php
index 814928a..3f13353 100644
--- a/xcode/aux_scripts/import_strings.php
+++ b/xcode/aux_scripts/import_strings.php
@@ -41,7 +41,7 @@
                                  'extension String {'.PHP_EOL;
             foreach ($json as $key=>$value) {
                 $value_without_linefeed = preg_replace("/\r|\n/", " ", $value);
-                $ios_swift_strings .= "\t/// ".$value_without_linefeed."\n\t".'static let '.preg_replace_callback('/_(.?)/', function ($m) { return strtoupper($m[1]); }, $key).' = NSLocalizedString("'.$key.'", comment: "")'."\n".PHP_EOL;
+                $ios_swift_strings .= "\t/// ".$value_without_linefeed."\n\t".'public static let '.preg_replace_callback('/_(.?)/', function ($m) { return strtoupper($m[1]); }, $key).' = NSLocalizedString("'.$key.'", comment: "")'."\n".PHP_EOL;
             }
             $ios_swift_strings .= '}'.PHP_EOL;
             file_put_contents($localization.'String+Localization.swift', $ios_swift_strings);

From 6ed301663c206e9da65498d2eec0bcd647e6cbb0 Mon Sep 17 00:00:00 2001
From: Victor Shabanov <shabanov.dev.git@gmail.com>
Date: Thu, 17 Oct 2019 18:54:39 +0300
Subject: [PATCH 3/5] Fix strings import script

---
 xcode/aux_scripts/import_strings.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xcode/aux_scripts/import_strings.php b/xcode/aux_scripts/import_strings.php
index 3f13353..52f79d6 100644
--- a/xcode/aux_scripts/import_strings.php
+++ b/xcode/aux_scripts/import_strings.php
@@ -38,10 +38,10 @@
                                  '// swiftlint:disable line_length'.PHP_EOL.
                                  '// swiftlint:disable file_length'.PHP_EOL.
                                  '// swiftlint:disable identifier_name'.PHP_EOL.PHP_EOL.
-                                 'extension String {'.PHP_EOL;
+                                 'public extension String {'.PHP_EOL;
             foreach ($json as $key=>$value) {
                 $value_without_linefeed = preg_replace("/\r|\n/", " ", $value);
-                $ios_swift_strings .= "\t/// ".$value_without_linefeed."\n\t".'public static let '.preg_replace_callback('/_(.?)/', function ($m) { return strtoupper($m[1]); }, $key).' = NSLocalizedString("'.$key.'", comment: "")'."\n".PHP_EOL;
+                $ios_swift_strings .= "\t/// ".$value_without_linefeed."\n\t".'static let '.preg_replace_callback('/_(.?)/', function ($m) { return strtoupper($m[1]); }, $key).' = NSLocalizedString("'.$key.'", comment: "")'."\n".PHP_EOL;
             }
             $ios_swift_strings .= '}'.PHP_EOL;
             file_put_contents($localization.'String+Localization.swift', $ios_swift_strings);

From df8e8f1efc2bb8ef71bb9b0a679f307d8c9d903f Mon Sep 17 00:00:00 2001
From: TonCherAmi <vasili.karaev@protonmail.com>
Date: Mon, 21 Oct 2019 18:15:19 +0300
Subject: [PATCH 4/5] up kotlin server api generator version

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

diff --git a/gradle/apiGeneratorKotlinServer.gradle b/gradle/apiGeneratorKotlinServer.gradle
index c2e8732..2f98ab0 100644
--- a/gradle/apiGeneratorKotlinServer.gradle
+++ b/gradle/apiGeneratorKotlinServer.gradle
@@ -7,7 +7,7 @@ configurations {
 }
 
 dependencies {
-    apigeneratorKotlinServer 'ru.touchin:api-generator:1.3.4'
+    apigeneratorKotlinServer 'ru.touchin:api-generator:1.4.0-alpha1'
 }
 
 task generateApiModelsKotlinServer doLast {

From 12f908a01bdb26184a413d6d293ccd14d462645e Mon Sep 17 00:00:00 2001
From: Ivan Vlasov <Blizzed@bk.ru>
Date: Tue, 5 Nov 2019 18:21:53 +0300
Subject: [PATCH 5/5] Api generator version updated to 1.4.0-beta1 (#150)

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

diff --git a/gradle/apiGenerator.gradle b/gradle/apiGenerator.gradle
index 2efcf09..e8f08af 100644
--- a/gradle/apiGenerator.gradle
+++ b/gradle/apiGenerator.gradle
@@ -7,7 +7,7 @@ configurations {
 }
 
 dependencies {
-    apigenerator 'ru.touchin:api-generator:1.4.0-alpha1'
+    apigenerator 'ru.touchin:api-generator:1.4.0-beta1'
 }
 
 android.applicationVariants.all { variant ->