Merge branch 'feat-preps-for-0.13' of github.com:appwrite/sdk-generator into feat-preps-0.13-install-sh

christyjacob4 · christyjacob4 · commit bc6bb86f4c97 · 2022-03-01T14:05:38.000+04:00
diff --git a/specs/swagger2-latest-console.json b/specs/swagger2-latest-console.json
diff --git a/src/SDK/Language/Android.php b/src/SDK/Language/Android.php
@@ -158,6 +158,12 @@ public function getFiles()
                 'template'      => '/android/library/src/main/java/io/appwrite/models/RealtimeModels.kt.twig',
                 'minify'        => false,
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/library/src/main/java/{{ sdk.namespace | caseSlash }}/models/UploadProgress.kt',
+                'template'      => '/android/library/src/main/java/io/appwrite/models/UploadProgress.kt.twig',
+                'minify'        => false,
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/library/src/main/java/{{ sdk.namespace | caseSlash }}/WebAuthComponent.kt',
diff --git a/src/SDK/Language/Kotlin.php b/src/SDK/Language/Kotlin.php
@@ -390,6 +390,12 @@ public function getFiles()
                 'template'      => '/kotlin/src/main/kotlin/io/appwrite/services/ServiceTemplate.kt.twig',
                 'minify'        => false,
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/src/main/kotlin/{{ sdk.namespace | caseSlash }}/models/UploadProgress.kt',
+                'template'      => '/kotlin/src/main/kotlin/io/appwrite/models/UploadProgress.kt.twig',
+                'minify'        => false,
+            ],
             [
                 'scope'         => 'definition',
                 'destination'   => '/src/main/kotlin/{{ sdk.namespace | caseSlash }}/models/{{ definition.name | caseUcfirst }}.kt',
diff --git a/src/SDK/Language/Swift.php b/src/SDK/Language/Swift.php
@@ -163,6 +163,12 @@ public function getFiles()
                 'template'      => 'swift/Sources/Models/Query.swift.twig',
                 'minify'        => false,
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/Models/UploadProgress.swift',
+                'template'      => 'swift/Sources/Models/UploadProgress.swift.twig',
+                'minify'        => false,
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/Extensions/Codable+JSON.swift',
diff --git a/templates/android/.github/workflows/publish.yml b/templates/android/.github/workflows/publish.yml
@@ -28,7 +28,7 @@ jobs:
 
         # Builds the release artifacts of the library
       - name: Build Release Artifacts
-        run: ./gradlew --info library:assembleRelease
+        run: ./gradlew library:assembleRelease
 
         # Generates other artifacts (javadocJar is optional)
       - name: Generate Source jar
@@ -39,10 +39,10 @@ jobs:
         run: |
           if ${{ endswith(github.event.release.tag_name, '-SNAPSHOT') }}; then
             echo "Publising Snapshot Version ${{ github.event.release.tag_name}} to Snapshot repository"
-            ./gradlew publishReleasePublicationToSonatypeRepository
+            ./gradlew publishToSonatype
           else
             echo "Publising Release Version ${{ github.event.release.tag_name}} to Staging repository"
-            ./gradlew publishReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository
+            ./gradlew publishToSonatype --max-workers 1 closeAndReleaseSonatypeStagingRepository
           fi
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
diff --git a/templates/android/build.gradle.twig b/templates/android/build.gradle.twig
@@ -3,7 +3,7 @@ apply plugin: 'io.github.gradle-nexus.publish-plugin'
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext.kotlin_version = "1.5.31"
-    version "{{ sdk.version }}"
+    version System.getenv("SDK_VERSION")
     repositories {
         maven { url "https://plugins.gradle.org/m2/" }
         google()
diff --git a/templates/android/library/build.gradle.twig b/templates/android/library/build.gradle.twig
@@ -19,6 +19,8 @@ ext {
     GITHUB_SCM_CONNECTION = 'scm:git:git://github.com/{{ sdk.gitUserName }}/{{ sdk.gitRepoName }}.git'
 }
 
+version PUBLISH_VERSION
+
 android {
     compileSdkVersion(31)
 
diff --git a/templates/android/library/src/main/java/io/appwrite/Client.kt.twig b/templates/android/library/src/main/java/io/appwrite/Client.kt.twig
@@ -8,6 +8,7 @@ import {{ sdk.namespace | caseDot }}.{{ spec.title | caseLower }}.BuildConfig
 import {{ sdk.namespace | caseDot }}.exceptions.{{ spec.title | caseUcfirst }}Exception
 import {{ sdk.namespace | caseDot }}.extensions.fromJson
 import {{ sdk.namespace | caseDot }}.json.PreciseNumberAdapter
+import {{ sdk.namespace | caseDot }}.models.UploadProgress
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -317,7 +318,7 @@ class Client @JvmOverloads constructor(
         responseType: Class<T>,
         convert: ((Map<String, Any,>) -> T),
         paramName: String,
-        onProgress: ((Double) -> Unit)? = null,
+        onProgress: ((UploadProgress) -> Unit)? = null,
     ): T {
         val file = params[paramName] as File
         val size = file.length()
@@ -371,7 +372,13 @@ class Client @JvmOverloads constructor(
 
             offset += CHUNK_SIZE
             headers["x-{{ spec.title | caseLower }}-id"] = result!!["\$id"].toString()
-            onProgress?.invoke(offset.coerceAtMost(size).toDouble()/size * 100)
+            onProgress?.invoke(UploadProgress(
+                id = result!!["\$id"].toString(),
+                progress = offset.coerceAtMost(size).toDouble()/size * 100,
+                sizeUploaded = offset.coerceAtMost(size),
+                chunksTotal = result!!["chunksTotal"].toString().toInt(),
+                chunksUploaded = result!!["chunksUploaded"].toString().toInt(),
+            ))
         }
 
         return convert(result as Map<String, Any>)
diff --git a/templates/android/library/src/main/java/io/appwrite/models/Error.kt.twig b/templates/android/library/src/main/java/io/appwrite/models/Error.kt.twig
diff --git a/templates/android/library/src/main/java/io/appwrite/models/Model.kt.twig b/templates/android/library/src/main/java/io/appwrite/models/Model.kt.twig
@@ -1,4 +1,4 @@
-{% macro sub_schema(property) %}{% if property.sub_schema %}{% if property.type == 'array' %}List<{{property.sub_schema | caseUcfirst}}>{% else %}{{property.sub_schema | caseUcfirst}}{% endif %}{% else %}{{property.type | typeName}}{% endif %}{% endmacro %}
+{% macro sub_schema(property) %}{% if property.sub_schema %}{% if property.type == 'array' %}List<{{property.sub_schema | caseUcfirst}}>{% else %}{{property.sub_schema | caseUcfirst}}{% endif %}{% else %}{% if property.type == 'object' and property.additionalProperties %}Map<String, Any>{% else %}{{property.type | typeName}}{% endif %}{% endif %}{% endmacro %}
 package {{ sdk.namespace | caseDot }}.models
 
 import com.google.gson.annotations.SerializedName
diff --git a/templates/android/library/src/main/java/io/appwrite/models/UploadProgress.kt.twig b/templates/android/library/src/main/java/io/appwrite/models/UploadProgress.kt.twig
@@ -0,0 +1,9 @@
+package {{ sdk.namespace | caseDot }}.models
+
+data class UploadProgress(
+    val id: String,
+    val progress: Double,
+    val sizeUploaded: Long,
+    val chunksTotal: Int,
+    val chunksUploaded: Int
+)
diff --git a/templates/android/library/src/main/java/io/appwrite/services/ServiceTemplate.kt.twig b/templates/android/library/src/main/java/io/appwrite/services/ServiceTemplate.kt.twig
@@ -1,6 +1,6 @@
 {% macro parameter(parameter) %}{{ parameter.name | caseCamel }}: {{ parameter.type | typeName }}{% if not parameter.required %}? = null{% endif %}{% endmacro %}
 {% macro method_parameters(parameters, consumes) %}
-{% if parameters.all|length > 0 %}{% for parameter in parameters.all %}{{ '\n\t\t' }}{{ _self.parameter(parameter) }}{% if not loop.last %}{{ ',' }}{% endif %}{% endfor %}{% if 'multipart/form-data' in consumes %}, onProgress: ((Double) -> Unit)? = null{% endif %}{% endif %}
+{% if parameters.all|length > 0 %}{% for parameter in parameters.all %}{{ '\n\t\t' }}{{ _self.parameter(parameter) }}{% if not loop.last %}{{ ',' }}{% endif %}{% endfor %}{% if 'multipart/form-data' in consumes %}, onProgress: ((UploadProgress) -> Unit)? = null{% endif %}{% endif %}
 {% endmacro %}
 {% macro methodNeedsSecurityParameters(method) %}
 {% if (method.type == "webAuth" or method.type == "location") and method.security|length > 0 %}{{ true }}{% else %}{{false}}{% endif %}
diff --git a/templates/dart/lib/src/models/model.dart.twig b/templates/dart/lib/src/models/model.dart.twig
@@ -1,4 +1,4 @@
-{% macro sub_schema(property) %}{% if property.sub_schema %}{% if property.type == 'array' %}List<{{property.sub_schema | caseUcfirst | overrideIdentifier}}>{% else %}{{property.sub_schema | caseUcfirst | overrideIdentifier }}{% endif %}{% else %}{{property.type | typeName}}{% endif %}{% endmacro %}
+{% macro sub_schema(property) %}{% if property.sub_schema %}{% if property.type == 'array' %}List<{{property.sub_schema | caseUcfirst | overrideIdentifier}}>{% else %}{{property.sub_schema | caseUcfirst | overrideIdentifier }}{% endif %}{% else %}{% if property.type == 'object' and property.additionalProperties %}Map<String, dynamic>{% else %}{{property.type | typeName}}{% endif %}{% endif %}{% endmacro %}
 part of {{ language.params.packageName }}.models;
 
 /// {{ definition.description }}
diff --git a/templates/flutter/lib/src/models/model.dart.twig b/templates/flutter/lib/src/models/model.dart.twig
@@ -1,4 +1,4 @@
-{% macro sub_schema(property) %}{% if property.sub_schema %}{% if property.type == 'array' %}List<{{property.sub_schema | caseUcfirst}}>{% else %}{{property.sub_schema | caseUcfirst}}{% endif %}{% else %}{{property.type | typeName}}{% endif %}{% endmacro %}
+{% macro sub_schema(property) %}{% if property.sub_schema %}{% if property.type == 'array' %}List<{{property.sub_schema | caseUcfirst}}>{% else %}{{property.sub_schema | caseUcfirst}}{% endif %}{% else %}{% if property.type == 'object' and property.additionalProperties %}Map<String, dynamic>{% else %}{{property.type | typeName}}{% endif %}{% endif %}{% endmacro %}
 part of {{ language.params.packageName }}.models;
 
 /// {{ definition.description }}
diff --git a/templates/kotlin/.github/workflows/publish.yml b/templates/kotlin/.github/workflows/publish.yml
@@ -26,6 +26,12 @@ jobs:
           sudo bash -c "echo '$GPG_KEY_CONTENTS' | base64 -d > '$SIGNING_SECRET_KEY_RING_FILE'"
           chmod +x ./gradlew
 
+        # Builds the artifacts of the library
+      - name: Build Release Artifacts
+        run: ./gradlew assemble
+        env:
+          SDK_VERSION: ${{ github.event.release.tag_name }}
+
         # Runs upload, and then closes & releases the repository
       - name: Publish Release Version to MavenCentral
         run: |
@@ -34,7 +40,7 @@ jobs:
             ./gradlew publishToSonatype
           else
             echo "Publising Release Version ${{ github.event.release.tag_name}} to Staging repository"
-            ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
+            ./gradlew publishToSonatype --max-workers 1 closeAndReleaseSonatypeStagingRepository
           fi
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
diff --git a/templates/kotlin/scripts/publish.gradle b/templates/kotlin/scripts/publish.gradle
@@ -73,10 +73,5 @@ ext["signing.password"] = rootProject.ext["signing.password"]
 ext["signing.secretKeyRingFile"] = rootProject.ext["signing.secretKeyRingFile"]
 
 signing {
-    useInMemoryPgpKeys(
-        rootProject.ext["signing.keyId"],
-        rootProject.ext["signing.secretKeyRingFile"],
-        rootProject.ext["signing.password"],
-    )
     sign publishing.publications
 }
diff --git a/templates/kotlin/src/main/kotlin/io/appwrite/Client.kt.twig b/templates/kotlin/src/main/kotlin/io/appwrite/Client.kt.twig
@@ -5,6 +5,7 @@ import com.google.gson.reflect.TypeToken
 import {{ sdk.namespace | caseDot }}.exceptions.{{ spec.title | caseUcfirst }}Exception
 import {{ sdk.namespace | caseDot }}.extensions.fromJson
 import {{ sdk.namespace | caseDot }}.json.PreciseNumberAdapter
+import {{ sdk.namespace | caseDot }}.models.UploadProgress
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -276,7 +277,7 @@ class Client @JvmOverloads constructor(
         responseType: Class<T>,
         convert: ((Map<String, Any,>) -> T),
         paramName: String,
-        onProgress: ((Double) -> Unit)? = null,
+        onProgress: ((UploadProgress) -> Unit)? = null,
     ): T {
         val file = params[paramName] as File
         val size = file.length()
@@ -330,7 +331,13 @@ class Client @JvmOverloads constructor(
 
             offset += CHUNK_SIZE
             headers["x-{{ spec.title | caseLower }}-id"] = result!!["\$id"].toString()
-            onProgress?.invoke(offset.coerceAtMost(size).toDouble()/size * 100)
+            onProgress?.invoke(UploadProgress(
+                id = result!!["\$id"].toString(),
+                progress = offset.coerceAtMost(size).toDouble()/size * 100,
+                sizeUploaded = offset.coerceAtMost(size),
+                chunksTotal = result!!["chunkTotal"].toString().toInt(),
+                chunksUploaded = result!!["chunkUploaded"].toString().toInt(),
+            ))
         }
 
         return convert(result as Map<String, Any>)
diff --git a/templates/kotlin/src/main/kotlin/io/appwrite/models/Model.kt.twig b/templates/kotlin/src/main/kotlin/io/appwrite/models/Model.kt.twig
@@ -1,4 +1,4 @@
-{% macro sub_schema(property) %}{% if property.sub_schema %}{% if property.type == 'array' %}List<{{property.sub_schema | caseUcfirst}}>{% else %}{{property.sub_schema | caseUcfirst}}{% endif %}{% else %}{{property.type | typeName}}{% endif %}{% endmacro %}
+{% macro sub_schema(property) %}{% if property.sub_schema %}{% if property.type == 'array' %}List<{{property.sub_schema | caseUcfirst}}>{% else %}{{property.sub_schema | caseUcfirst}}{% endif %}{% else %}{% if property.type == 'object' and property.additionalProperties %}Map<String, Any>{% else %}{{property.type | typeName}}{% endif %}{% endif %}{% endmacro %}
 package {{ sdk.namespace | caseDot }}.models
 
 import com.google.gson.annotations.SerializedName
diff --git a/templates/kotlin/src/main/kotlin/io/appwrite/models/UploadProgress.kt.twig b/templates/kotlin/src/main/kotlin/io/appwrite/models/UploadProgress.kt.twig
@@ -0,0 +1,9 @@
+package {{ sdk.namespace | caseDot }}.models
+
+data class UploadProgress(
+    val id: String,
+    val progress: Double,
+    val sizeUploaded: Long,
+    val chunksTotal: Int,
+    val chunksUploaded: Int
+)
diff --git a/templates/kotlin/src/main/kotlin/io/appwrite/services/ServiceTemplate.kt.twig b/templates/kotlin/src/main/kotlin/io/appwrite/services/ServiceTemplate.kt.twig
@@ -1,6 +1,6 @@
 {% macro parameter(parameter) %}{{ parameter.name | caseCamel }}: {{ parameter.type | typeName }}{% if not parameter.required %}? = null{% endif %}{% endmacro %}
 {% macro method_parameters(parameters, consumes) %}
-{% if parameters.all|length > 0 %}{% for parameter in parameters.all %}{{ '\n\t\t' }}{{ _self.parameter(parameter) }}{% if not loop.last %}{{ ',' }}{% endif %}{% endfor %}{% if 'multipart/form-data' in consumes %}, onProgress: ((Double) -> Unit)? = null{% endif %}{% endif %}
+{% if parameters.all|length > 0 %}{% for parameter in parameters.all %}{{ '\n\t\t' }}{{ _self.parameter(parameter) }}{% if not loop.last %}{{ ',' }}{% endif %}{% endfor %}{% if 'multipart/form-data' in consumes %}, onProgress: ((UploadProgress) -> Unit)? = null{% endif %}{% endif %}
 {% endmacro %}
 {% macro methodNeedsSecurityParameters(method) %}
 {% if (method.type == "webAuth" or method.type == "location") and method.security|length > 0 %}{{ true }}{% else %}{{false}}{% endif %}
diff --git a/templates/php/src/Services/Service.php.twig b/templates/php/src/Services/Service.php.twig
@@ -20,10 +20,10 @@ class {{ service.name | caseUcfirst }} extends Service
      * @param {{ parameter.type | typeName }}${{ parameter.name | caseCamel | escapeKeyword }}
 {% endfor %}
      * @throws {{spec.title | caseUcfirst}}Exception
-     * @return {% if (method.type == 'location') or (method.method | caseUpper == 'DELETE') %}string{% else %}array{% endif %}
+     * @return {% if method.type == 'location' %}string{% else %}array{% endif %}
 
      */
-    public function {{ method.name | caseCamel }}({% for parameter in method.parameters.all %}{{ parameter.type | typeName }}${{ parameter.name | caseCamel | escapeKeyword }}{% if not parameter.required %} = null{% endif %}{% if not loop.last %}, {% endif %}{% endfor %}{% if 'multipart/form-data' in method.consumes %}, callable $onProgress = null{% endif %}): {% if (method.type == 'location') or (method.method | caseUpper == 'DELETE') %}string{% else %}array{% endif %}
+    public function {{ method.name | caseCamel }}({% for parameter in method.parameters.all %}{{ parameter.type | typeName }}${{ parameter.name | caseCamel | escapeKeyword }}{% if not parameter.required %} = null{% endif %}{% if not loop.last %}, {% endif %}{% endfor %}{% if 'multipart/form-data' in method.consumes %}, callable $onProgress = null{% endif %}): {% if method.type == 'location' %}string{% else %}array{% endif %}
 
     {
 {% for parameter in method.parameters.all %}
diff --git a/templates/ruby/lib/container/client.rb.twig b/templates/ruby/lib/container/client.rb.twig
@@ -140,9 +140,13 @@ module {{ spec.title | caseUcfirst }}
                     headers['x-{{ spec.title }}-id'] = result['$id']
                 end
 
-                unless on_progress.nil?
-                    on_progress(min(offset, size)/size * 100)
-                end
+                on_progress.call({
+                    id: result['$id'],
+                    progress: ([offset, size].min).to_f/size.to_f * 100.0,
+                    size_uploaded: [offset, size].min,
+                    chunks_total: result['chunks_total'],
+                    chunks_uploaded: result['chunks_uploaded']
+                }) unless on_progress.nil?
             end
 
             return result unless response_type.respond_to?("from")
diff --git a/templates/swift/Sources/Client.swift.twig b/templates/swift/Sources/Client.swift.twig
@@ -29,6 +29,8 @@ open class Client {
 
     open var config: [String: String] = [:]
 
+    open var selfSigned: Bool = false
+
     open var http: HTTPClient
 
     private static let boundaryChars =
@@ -119,6 +121,7 @@ open class Client {
     /// @return Client
     ///
     open func setSelfSigned(_ status: Bool = true) -> Client {
+        self.selfSigned = status
         try! http.syncShutdown()
         http = Client.createHTTP(selfSigned: status)
         return self
@@ -391,7 +394,7 @@ open class Client {
         params: inout [String: Any?],
         paramName: String,
         convert: (([String: Any]) -> T)? = nil,
-        onProgress: ((Double) -> Void)? = nil,
+        onProgress: ((UploadProgress) -> Void)? = nil,
         completion: ((Result<T, {{ spec.title | caseUcfirst }}Error>) -> Void)? = nil
     ) {
         let file = params[paramName] as! File
@@ -416,7 +419,7 @@ open class Client {
 
         while offset < size {
             let slice = input.readSlice(length: Client.chunkSize)
-                ?? input.readSlice(length: size - offset)
+                ?? input.readSlice(length: Int(size - offset))
             
             params[paramName] = File(
                 name: file.name,
@@ -448,7 +451,13 @@ open class Client {
 
             offset += Client.chunkSize
             headers["x-{{ spec.title | caseLower }}-id"] = result["$id"] as? String
-            onProgress?(Double(min(offset, size))/Double(size) * 100.0)
+            onProgress?(UploadProgress(
+                id: result["$id"] as? String ?? "",
+                progress: Double(min(offset, size))/Double(size) * 100.0,
+                sizeUploaded: min(offset, size),
+                chunksTotal: result["chunksTotal"] as? Int ?? -1,
+                chunksUploaded: result["chunksUploaded"] as? Int ?? -1
+            ))
         }
 
         completion?(.success(convert!(result)))
diff --git a/templates/swift/Sources/Models/Model.swift.twig b/templates/swift/Sources/Models/Model.swift.twig
@@ -1,4 +1,4 @@
-{% macro sub_schema(property) %}{% if property.sub_schema %}{% if property.type == 'array' %}[{{property.sub_schema | caseUcfirst}}]{% else %}{{property.sub_schema | caseUcfirst}}{% endif %}{% else %}{{property.type | typeName}}{% endif %}{% endmacro %}
+{% macro sub_schema(property) %}{% if property.sub_schema %}{% if property.type == 'array' %}[{{property.sub_schema | caseUcfirst}}]{% else %}{{property.sub_schema | caseUcfirst}}{% endif %}{% else %}{% if property.type == 'object' and property.additionalProperties %}[String : Any]{% else %}{{property.type | typeName}}{% endif %}{% endif %}{% endmacro %}
 
 /// {{ definition.description }}
 public class {{ definition.name | caseUcfirst }} {
diff --git a/templates/swift/Sources/Models/UploadProgress.swift.twig b/templates/swift/Sources/Models/UploadProgress.swift.twig
@@ -0,0 +1,15 @@
+public class UploadProgress {
+    public let id: String
+    public let progress: Double
+    public let sizeUploaded: Int
+    public let chunksTotal: Int
+    public let chunksUploaded: Int
+
+    public init(id: String, progress: Double, sizeUploaded: Int, chunksTotal: Int, chunksUploaded: Int) {
+        self.id = id
+        self.progress = progress
+        self.sizeUploaded = sizeUploaded
+        self.chunksTotal = chunksTotal
+        self.chunksUploaded = chunksUploaded
+    }
+}
diff --git a/templates/swift/Sources/Services/Realtime.swift.twig b/templates/swift/Sources/Services/Realtime.swift.twig
@@ -38,7 +38,7 @@ open class Realtime : Service {
             reconnect = false
             closeSocket()
         } else {
-            socketClient = WebSocketClient(url, delegate: self)!
+            socketClient = WebSocketClient(url, tlsEnabled: !client.selfSigned, delegate: self)!
         }
 
         try! socketClient?.connect()
diff --git a/templates/swift/Sources/Services/Service.swift.twig b/templates/swift/Sources/Services/Service.swift.twig
@@ -32,7 +32,7 @@ open class {{ service.name | caseUcfirst }}: Service {
         {{ parameter.name | caseCamel | escapeKeyword }}: {{ parameter.type | typeName | raw }}{% if not parameter.required %}? = nil{% endif %},
 {% endfor %}
 {% if 'multipart/form-data' in method.consumes %}
-        onProgress: ((Double) -> Void)? = nil,
+        onProgress: ((UploadProgress) -> Void)? = nil,
 {% endif %}
         completion: ((Result<{{ _self.resultType(spec, method) }}, {{ spec.title | caseUcfirst}}Error>) -> Void)? = nil
     ) {
diff --git a/templates/swift/Sources/WebSockets/WebSocketClient.swift.twig b/templates/swift/Sources/WebSockets/WebSocketClient.swift.twig
diff --git a/tests/SwiftClientTest.php b/tests/SwiftClientTest.php
diff --git a/tests/SwiftServerTest.php b/tests/SwiftServerTest.php
diff --git a/tests/languages/kotlin/ServiceTest.kt b/tests/languages/kotlin/ServiceTest.kt

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@ ext {`
`19`	`19`	`GITHUB_SCM_CONNECTION = 'scm:git:git://github.com/{{ sdk.gitUserName }}/{{ sdk.gitRepoName }}.git'`
`20`	`20`	`}`
`21`	`21`
	`22`	`+version PUBLISH_VERSION`
	`23`	`+`
`22`	`24`	`android {`
`23`	`25`	`compileSdkVersion(31)`
`24`	`26`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% macro sub_schema(property) %}{% if property.sub_schema %}{% if property.type == 'array' %}List<{{property.sub_schema \| caseUcfirst}}>{% else %}{{property.sub_schema \| caseUcfirst}}{% endif %}{% else %}{{property.type \| typeName}}{% endif %}{% endmacro %}`
	`1`	`+{% macro sub_schema(property) %}{% if property.sub_schema %}{% if property.type == 'array' %}List<{{property.sub_schema \| caseUcfirst}}>{% else %}{{property.sub_schema \| caseUcfirst}}{% endif %}{% else %}{% if property.type == 'object' and property.additionalProperties %}Map<String, Any>{% else %}{{property.type \| typeName}}{% endif %}{% endif %}{% endmacro %}`
`2`	`2`	`package {{ sdk.namespace \| caseDot }}.models`
`3`	`3`
`4`	`4`	`import com.google.gson.annotations.SerializedName`