Merge pull request #710 from appwrite/feat-dependency-upgrades-2

Fix- Flutter & Dart SDK score
appwrite · Mar 24, 2024 · ad80d80 · ad80d80
2 parents 133e1b1 + 16313a4
commit ad80d80
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 25 deletions.
diff --git a/templates/dart/lib/id.dart.twig b/templates/dart/lib/id.dart.twig
@@ -1,4 +1,4 @@
-part of {{ language.params.packageName }};
+part of '{{ language.params.packageName }}.dart';
 
 /// Helper class to generate ID strings for resources.
 class ID {

diff --git a/templates/dart/lib/permission.dart.twig b/templates/dart/lib/permission.dart.twig
@@ -1,4 +1,4 @@
-part of {{ language.params.packageName }};
+part of '{{ language.params.packageName }}.dart';
 
 /// Helper class to generate permission strings for resources.
 class Permission {

diff --git a/templates/dart/lib/query.dart.twig b/templates/dart/lib/query.dart.twig
@@ -1,4 +1,4 @@
-part of {{ language.params.packageName }};
+part of '{{ language.params.packageName }}.dart';
 
 
 /// Helper class to generate query strings.

diff --git a/templates/dart/lib/role.dart.twig b/templates/dart/lib/role.dart.twig
@@ -1,4 +1,4 @@
-part of {{ language.params.packageName }};
+part of '{{ language.params.packageName }}.dart';
 
 /// Helper class to generate role strings for [Permission].
 class Role {

diff --git a/templates/dart/lib/services/service.dart.twig b/templates/dart/lib/services/service.dart.twig
@@ -1,4 +1,4 @@
-part of {{ language.params.packageName }};
+part of '../{{ language.params.packageName }}.dart';
 {% macro parameter(parameter) %}{% if parameter.required %}required {% endif %}{{ parameter | typeName }}{% if not parameter.required or parameter.nullable %}?{% endif %} {{ parameter.name | caseCamel | overrideIdentifier }}{% endmacro %}
 {% macro method_parameters(parameters, consumes) %}
 {% if parameters|length > 0 %}{{ '{' }}{% for parameter in parameters %}{{ _self.parameter(parameter) }}{% if not loop.last %}, {% endif %}{% endfor %}{% if 'multipart/form-data' in consumes %}, Function(UploadProgress)? onProgress{% endif %}{{ '}' }}{% endif %}

diff --git a/templates/dart/lib/src/enums/enum.dart.twig b/templates/dart/lib/src/enums/enum.dart.twig
@@ -1,4 +1,4 @@
-part of {{ language.params.packageName }}.enums;
+part of '../../enums.dart';
 
 enum {{ enum.name | caseUcfirst | overrideIdentifier }} {
     {%~ for value in enum.enum %}

diff --git a/templates/dart/lib/src/models/model.dart.twig b/templates/dart/lib/src/models/model.dart.twig
@@ -1,5 +1,5 @@
 {% 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 | typeName}}{% endif %}{% endif %}{% endmacro %}
-part of {{ language.params.packageName }}.models;
+part of '../../models.dart';
 
 /// {{ definition.description }}
 class {{ definition.name | caseUcfirst | overrideIdentifier }} implements Model {

diff --git a/templates/dart/lib/src/models/model_base.dart.twig b/templates/dart/lib/src/models/model_base.dart.twig
@@ -1,4 +1,4 @@
-part of {{ language.params.packageName }}.models;
+part of '../../models.dart';
 
 abstract class Model {
   Map<String, dynamic> toMap();

diff --git a/templates/dart/pubspec.yaml.twig b/templates/dart/pubspec.yaml.twig
@@ -6,11 +6,11 @@ repository: https://github.com/{{sdk.gitUserName}}/{{sdk.gitRepoName}}
 issue_tracker: https://github.com/appwrite/sdk-generator/issues
 documentation: {{ spec.contactURL }}
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=2.17.0 <4.0.0'
 dependencies:
-  http: '>=0.13.6 <1.0.1'
+  http: '>=0.13.6 <2.0.0'
 
 dev_dependencies:
-  lints: ^2.0.1
-  test: ^1.22.0
-  mockito: ^5.4.0
+  lints: ^3.0.0
+  test: ^1.25.0
+  mockito: ^5.4.4
diff --git a/templates/flutter/lib/services/service.dart.twig b/templates/flutter/lib/services/service.dart.twig
@@ -1,4 +1,4 @@
-part of {{ language.params.packageName }};
+part of '../{{ language.params.packageName }}.dart';
 {% macro parameter(parameter) %}{% if parameter.required %}required {% endif %}{{ parameter | typeName }}{% if not parameter.required or parameter.nullable %}?{% endif %} {{ parameter.name | caseCamel | overrideIdentifier }}{% endmacro %}
 {% macro method_parameters(parameters, consumes) %}
 {% if parameters|length > 0 %}{{ '{' }}{% for parameter in parameters %}{{ _self.parameter(parameter) }}{% if not loop.last %}, {% endif %}{% endfor %}{% if 'multipart/form-data' in consumes %}, Function(UploadProgress)? onProgress{% endif %}{{ '}' }}{% endif %}

diff --git a/templates/flutter/pubspec.yaml.twig b/templates/flutter/pubspec.yaml.twig
@@ -18,18 +18,18 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  cookie_jar: ^4.0.3
-  device_info_plus: ^9.0.2
-  flutter_web_auth_2: ^3.0.0
+  cookie_jar: ^4.0.8
+  device_info_plus: ^9.1.2
+  flutter_web_auth_2: ^3.1.1
   http: '>=0.13.6 <2.0.0'
-  package_info_plus: ^4.0.2
-  path_provider: ^2.0.15
-  web_socket_channel: ^2.4.0
+  package_info_plus: ^5.0.1
+  path_provider: ^2.1.2
+  web_socket_channel: ^2.4.3
   universal_html: ^2.2.2
 
 dev_dependencies:
-  path_provider_platform_interface: ^2.0.6
-  flutter_lints: ^2.0.1
+  path_provider_platform_interface: ^2.1.2
+  flutter_lints: ^3.0.1
   flutter_test:
     sdk: flutter
-  mockito: ^5.4.0
+  mockito: ^5.4.4
diff --git a/tests/FlutterBetaTest.php b/tests/FlutterBetaTest.php
@@ -16,7 +16,7 @@ class FlutterBetaTest extends Base
         'cp tests/languages/flutter/tests.dart tests/sdks/flutter/test/appwrite_test.dart',
     ];
     protected string $command =
-        'docker run --network="mockapi" --rm -v $(pwd):/app -w /app/tests/sdks/flutter --env PUB_CACHE=vendor cirrusci/flutter:beta sh -c "flutter pub get && flutter test test/appwrite_test.dart"';
+        'docker run --network="mockapi" --rm -v $(pwd):/app -w /app/tests/sdks/flutter fischerscode/flutter-sudo:beta sh -c "sudo chown -R flutter:flutter . && flutter pub get && flutter test test/appwrite_test.dart"';
 
     protected array $expectedOutput = [
         ...Base::FOO_RESPONSES,

diff --git a/tests/FlutterStableTest.php b/tests/FlutterStableTest.php
@@ -16,7 +16,7 @@ class FlutterStableTest extends Base
         'cp tests/languages/flutter/tests.dart tests/sdks/flutter/test/appwrite_test.dart',
     ];
     protected string $command =
-        'docker run --network="mockapi" --rm -v $(pwd):/app -w /app/tests/sdks/flutter --env PUB_CACHE=vendor cirrusci/flutter:stable sh -c "flutter pub get && flutter test test/appwrite_test.dart"';
+        'docker run --network="mockapi" --rm -v $(pwd):/app:rw -w /app/tests/sdks/flutter fischerscode/flutter-sudo:stable sh -c "sudo chown -R flutter:flutter . && flutter pub get && flutter test test/appwrite_test.dart"';
 
     protected array $expectedOutput = [
         ...Base::FOO_RESPONSES,