Merge remote-tracking branch 'origin/master' into feat-kotlin-generics

# Conflicts:
#	src/SDK/Language.php
#	templates/android/library/src/main/java/io/appwrite/services/ServiceTemplate.kt.twig
#	templates/kotlin/base/requests/api.twig
#	templates/kotlin/base/requests/file.twig
#	templates/kotlin/base/requests/location.twig
#	templates/kotlin/base/utils.twig
#	templates/kotlin/src/main/kotlin/io/appwrite/services/ServiceTemplate.kt.twig

Author: abnegate

.travis.yml

@@ -46,8 +46,8 @@ env:
   - SDK=Ruby27
   - SDK=Ruby30
   - SDK=Ruby31
-  - SDK=SwiftClient55
-  - SDK=SwiftServer55
+  - SDK=AppleSwift55
+  - SDK=Swift55
   - SDK=WebChromium
   - SDK=WebNode
 

example.php

@@ -15,7 +15,7 @@
 use Appwrite\SDK\Language\Deno;
 use Appwrite\SDK\Language\HTTP;
 use Appwrite\SDK\Language\Swift;
-use Appwrite\SDK\Language\SwiftClient;
+use Appwrite\SDK\Language\Apple;
 use Appwrite\SDK\Language\DotNet;
 use Appwrite\SDK\Language\Flutter;
 use Appwrite\SDK\Language\Android;
@@ -35,11 +35,12 @@ function getSSLPage($url) {
         return $result;
     }
 
-    //$spec = getSSLPage('https://appwrite.io/v1/open-api-2.json?extensions=1');
-    // $spec = getSSLPage('https://appwrite.io/v1/open-api-2.json?extensions=1'); // Enable only with Appwrite local server running on port 80
-    // $spec = getSSLPage('https://appwrite.io/v1/open-api-2.json?extensions=1&platform=console'); // Enable only with Appwrite local server running on port 80
-    // $spec = file_get_contents('https://appwrite.io/specs/swagger2?platform=client');
-    $spec = file_get_contents('./specs/swagger2-latest-console.json');
+    // Leave the platform you want uncommented
+    $platform = 'client';
+    // $platform = 'console';
+    // $platform = 'server';
+
+    $spec = getSSLPage("https://raw.githubusercontent.com/appwrite/appwrite/master/app/config/specs/swagger2-latest-${platform}.json");
 
     if(empty($spec)) {
         throw new Exception('Failed to fetch spec from Appwrite server');
@@ -341,7 +342,7 @@ function getSSLPage($url) {
     $sdk->generate(__DIR__ . '/examples/swift-server');
 
     // Swift (Client)
-    $sdk  = new SDK(new SwiftClient(), new Swagger2($spec));
+    $sdk  = new SDK(new Apple(), new Swagger2($spec));
 
     $sdk
         ->setName('NAME')
@@ -362,7 +363,7 @@ function getSSLPage($url) {
         ])
     ;
 
-    $sdk->generate(__DIR__ . '/examples/swift-client');
+    $sdk->generate(__DIR__ . '/examples/apple');
 
     // DotNet
     $sdk  = new SDK(new DotNet(), new Swagger2($spec));