Merge remote-tracking branch 'origin/master' into fix-ruby-services

Author: abnegate

templates/kotlin/src/main/kotlin/io/appwrite/models/Model.kt.twig

@@ -6,7 +6,7 @@ import com.google.gson.annotations.SerializedName
 /**
  * {{ definition.description }}
  */
-{% if definition.properties | length == 0 %}
+{% if definition.properties | length == 0 and not definition.additionalProperties %}
 class {{ definition.name | caseUcfirst }} {}
 {% else %}
 data class {{ definition.name | caseUcfirst }}(

templates/node/.travis.yml.twig

@@ -1,12 +1,12 @@
 language: node_js
 node_js:
-  - "18.8.0"
+  - "14.16"
 
 jobs:
   include:
     - stage: NPM RC Release
       if: tag == *-RC*
-      node_js: "18.8.0"
+      node_js: "14.16"
       script: echo "Deploying RC to NPM..."
       deploy:
         provider: npm
@@ -15,7 +15,7 @@ jobs:
         tag: next
     - stage: NPM Release
       if: tag != *-RC*
-      node_js: "18.8.0"
+      node_js: "14.16"
       script: echo "Deploying to NPM..."
       deploy:
         provider: npm

templates/swift/Sources/Models/Model.swift.twig

@@ -1,6 +1,9 @@
 {% 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 | typeName}}{% endif %}{% endif %}{% endmacro %}
 
 /// {{ definition.description }}
+{% if definition.properties | length == 0 and not definition.additionalProperties %}
+public class {{ definition.name | caseUcfirst }} {}
+{% else %}
 public class {{ definition.name | caseUcfirst }} {
 
 {% for property in definition.properties %}
@@ -72,4 +75,5 @@ public class {{ definition.name | caseUcfirst }} {
 {% endif %}
 {% endfor %}
 
-}
+}
+{% endif %}

templates/web/.travis.yml.twig

@@ -1,12 +1,12 @@
 language: node_js
 node_js:
-  - "18.8.0"
+  - "14.16"
 
 jobs:
   include:
     - stage: NPM RC Release
       if: tag == *-RC*
-      node_js: "18.8.0"
+      node_js: "14.16"
       script:
         - npm install
         - npm run build
@@ -18,7 +18,7 @@ jobs:
         tag: next
     - stage: NPM Release
       if: tag != *-RC*
-      node_js: "18.8.0"
+      node_js: "14.16"
       script:
         - npm install
         - npm run build