From a01f840f3ddf2b86d15e53f5dfc1b73acc5ca8ac Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Mon, 4 Sep 2023 07:56:27 +0000 Subject: [PATCH 01/16] update dart dependencies --- templates/dart/pubspec.yaml.twig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/dart/pubspec.yaml.twig b/templates/dart/pubspec.yaml.twig index c9b59af20..fe9efb1ff 100644 --- a/templates/dart/pubspec.yaml.twig +++ b/templates/dart/pubspec.yaml.twig @@ -8,9 +8,9 @@ documentation: {{ spec.contactURL }} environment: sdk: '>=2.17.0 <3.0.0' dependencies: - http: '>=0.13.6 <1.0.1' + http: '>=0.13.6 <1.1.0' dev_dependencies: - lints: ^2.0.1 - test: ^1.22.0 - mockito: ^5.4.0 + lints: ^2.1.1 + test: ^1.24.6 + mockito: ^5.4.2 From b5e60a4711fecb685cbf1a7bfd15b51660a1f1c3 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Mon, 4 Sep 2023 07:59:09 +0000 Subject: [PATCH 02/16] update flutter dependencies --- templates/flutter/pubspec.yaml.twig | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/flutter/pubspec.yaml.twig b/templates/flutter/pubspec.yaml.twig index c2463e971..984cc559a 100644 --- 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 + cookie_jar: ^4.0.8 device_info_plus: ^9.0.2 - flutter_web_auth_2: ^2.1.4 - http: '>=0.13.6 <1.0.1' - package_info_plus: ^4.0.2 - path_provider: ^2.0.15 + flutter_web_auth_2: ^2.2.1 + http: '>=0.13.6 <1.1.0' + package_info_plus: ^4.1.0 + path_provider: ^2.1.1 web_socket_channel: ^2.4.0 - universal_html: ^2.2.2 + universal_html: ^2.2.3 dev_dependencies: - path_provider_platform_interface: ^2.0.6 - flutter_lints: ^2.0.1 + path_provider_platform_interface: ^2.1.1 + flutter_lints: ^2.0.3 flutter_test: sdk: flutter mockito: ^5.4.0 \ No newline at end of file From 31fc9047262b6f2cc2de1634589a4ed2406a8739 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Mon, 4 Sep 2023 08:03:14 +0000 Subject: [PATCH 03/16] upgrade node dependency --- templates/node/package.json.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/node/package.json.twig b/templates/node/package.json.twig index 6a8eae40c..bc544bc09 100644 --- a/templates/node/package.json.twig +++ b/templates/node/package.json.twig @@ -14,7 +14,7 @@ "@types/node": "^18.16.1" }, "dependencies": { - "axios": "^1.4.0", + "axios": "^1.5.0", "form-data": "^4.0.0" } } From 18181c249ffa922fd6925f27bb2f0569d7c814ee Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 29 Nov 2023 08:53:40 +0000 Subject: [PATCH 04/16] update flutter and dart dependencies --- templates/dart/pubspec.yaml.twig | 2 +- templates/flutter/pubspec.yaml.twig | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/dart/pubspec.yaml.twig b/templates/dart/pubspec.yaml.twig index fe9efb1ff..ae27dcdcb 100644 --- a/templates/dart/pubspec.yaml.twig +++ b/templates/dart/pubspec.yaml.twig @@ -8,7 +8,7 @@ documentation: {{ spec.contactURL }} environment: sdk: '>=2.17.0 <3.0.0' dependencies: - http: '>=0.13.6 <1.1.0' + http: '>=0.13.6 <2.0.0' dev_dependencies: lints: ^2.1.1 diff --git a/templates/flutter/pubspec.yaml.twig b/templates/flutter/pubspec.yaml.twig index 6a7fc3706..cf5e9c092 100644 --- a/templates/flutter/pubspec.yaml.twig +++ b/templates/flutter/pubspec.yaml.twig @@ -19,17 +19,17 @@ dependencies: flutter: sdk: flutter cookie_jar: ^4.0.8 - device_info_plus: ^9.0.2 - package_info_plus: ^4.1.0 + device_info_plus: ^9.1.1 + package_info_plus: ^5.0.1 path_provider: ^2.1.1 - flutter_web_auth_2: ^3.0.0 + flutter_web_auth_2: ^3.0.4 http: '>=0.13.6 <2.0.0' web_socket_channel: ^2.4.0 - universal_html: ^2.2.3 + universal_html: ^2.2.4 dev_dependencies: path_provider_platform_interface: ^2.1.1 - flutter_lints: ^2.0.3 + flutter_lints: ^3.0.1 flutter_test: sdk: flutter - mockito: ^5.4.0 + mockito: ^5.4.3 From 03c783febe03d049ac86be0cf86790e9df30b253 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 2 Jan 2024 06:42:42 +0000 Subject: [PATCH 05/16] change flutter docker image --- tests/FlutterStableTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/FlutterStableTest.php b/tests/FlutterStableTest.php index 1fba442ea..af01d2f4a 100644 --- 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:stable sh -c "flutter pub get && flutter test test/appwrite_test.dart"'; protected array $expectedOutput = [ ...Base::FOO_RESPONSES, From 5160b2038243a60e5d9ad3c22cd3847a4079bb1c Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 2 Jan 2024 06:47:47 +0000 Subject: [PATCH 06/16] fix stable test --- tests/FlutterStableTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/FlutterStableTest.php b/tests/FlutterStableTest.php index af01d2f4a..3c60b72e5 100644 --- 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:rw -w /app/tests/sdks/flutter fischerscode/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, From 94d7008bed3d083b408bd699c26facc94ccf92ce Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 2 Jan 2024 06:50:15 +0000 Subject: [PATCH 07/16] update beta test with new image --- tests/FlutterBetaTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/FlutterBetaTest.php b/tests/FlutterBetaTest.php index 50e4caaee..c971368b3 100644 --- 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, From da2ffb883ed64c780957a05f6e87327725d89c49 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 2 Jan 2024 07:01:26 +0000 Subject: [PATCH 08/16] update flutter dependencies --- templates/flutter/pubspec.yaml.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/flutter/pubspec.yaml.twig b/templates/flutter/pubspec.yaml.twig index cf5e9c092..39141733b 100644 --- a/templates/flutter/pubspec.yaml.twig +++ b/templates/flutter/pubspec.yaml.twig @@ -22,7 +22,7 @@ dependencies: device_info_plus: ^9.1.1 package_info_plus: ^5.0.1 path_provider: ^2.1.1 - flutter_web_auth_2: ^3.0.4 + flutter_web_auth_2: ^3.1.1 http: '>=0.13.6 <2.0.0' web_socket_channel: ^2.4.0 universal_html: ^2.2.4 @@ -32,4 +32,4 @@ dev_dependencies: flutter_lints: ^3.0.1 flutter_test: sdk: flutter - mockito: ^5.4.3 + mockito: ^5.4.4 From 3c9cccbc937f124f04c2584ded9a594dadf9ed36 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 2 Jan 2024 07:03:57 +0000 Subject: [PATCH 09/16] update dart dependencies --- templates/dart/pubspec.yaml.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/dart/pubspec.yaml.twig b/templates/dart/pubspec.yaml.twig index ae27dcdcb..13c115dc1 100644 --- a/templates/dart/pubspec.yaml.twig +++ b/templates/dart/pubspec.yaml.twig @@ -11,6 +11,6 @@ dependencies: http: '>=0.13.6 <2.0.0' dev_dependencies: - lints: ^2.1.1 - test: ^1.24.6 - mockito: ^5.4.2 + lints: ^3.0.0 + test: ^1.25.0 + mockito: ^5.4.4 From a1d8828d5fc273713f75f9d0bcb90c7719199321 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 2 Jan 2024 07:08:52 +0000 Subject: [PATCH 10/16] update axios in node --- templates/node/package.json.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/node/package.json.twig b/templates/node/package.json.twig index bc544bc09..cdf020742 100644 --- a/templates/node/package.json.twig +++ b/templates/node/package.json.twig @@ -14,7 +14,7 @@ "@types/node": "^18.16.1" }, "dependencies": { - "axios": "^1.5.0", + "axios": "^1.6.3", "form-data": "^4.0.0" } } From da4e3b05ed4bd19980714e0e276d34de11ba4b1d Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Mon, 12 Feb 2024 12:05:17 +0545 Subject: [PATCH 11/16] revert node change for now --- templates/node/package.json.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/node/package.json.twig b/templates/node/package.json.twig index cdf020742..6a8eae40c 100644 --- a/templates/node/package.json.twig +++ b/templates/node/package.json.twig @@ -14,7 +14,7 @@ "@types/node": "^18.16.1" }, "dependencies": { - "axios": "^1.6.3", + "axios": "^1.4.0", "form-data": "^4.0.0" } } From 475e0842611055326e7f0926702678b135a488c6 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Sun, 10 Mar 2024 02:02:12 +0000 Subject: [PATCH 12/16] update flutter dependencies --- templates/flutter/pubspec.yaml.twig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/flutter/pubspec.yaml.twig b/templates/flutter/pubspec.yaml.twig index 39141733b..56c32bf99 100644 --- a/templates/flutter/pubspec.yaml.twig +++ b/templates/flutter/pubspec.yaml.twig @@ -19,16 +19,16 @@ dependencies: flutter: sdk: flutter cookie_jar: ^4.0.8 - device_info_plus: ^9.1.1 - package_info_plus: ^5.0.1 - path_provider: ^2.1.1 + device_info_plus: ^9.1.2 flutter_web_auth_2: ^3.1.1 http: '>=0.13.6 <2.0.0' - web_socket_channel: ^2.4.0 - universal_html: ^2.2.4 + 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.1.1 + path_provider_platform_interface: ^2.1.2 flutter_lints: ^3.0.1 flutter_test: sdk: flutter From 5de68697632b95ddcaf57b8974d9380acfede571 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Sun, 10 Mar 2024 02:04:06 +0000 Subject: [PATCH 13/16] update sdk constraints --- templates/dart/pubspec.yaml.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/dart/pubspec.yaml.twig b/templates/dart/pubspec.yaml.twig index 13c115dc1..5c1029cc9 100644 --- a/templates/dart/pubspec.yaml.twig +++ b/templates/dart/pubspec.yaml.twig @@ -6,7 +6,7 @@ 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 <2.0.0' From 7b0a2906947ce25d275ca285904775167f358dad Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Sun, 10 Mar 2024 02:10:35 +0000 Subject: [PATCH 14/16] fix dart part of --- templates/dart/lib/id.dart.twig | 2 +- templates/dart/lib/permission.dart.twig | 2 +- templates/dart/lib/query.dart.twig | 2 +- templates/dart/lib/role.dart.twig | 2 +- templates/dart/lib/services/service.dart.twig | 2 +- templates/dart/lib/src/enums/enum.dart.twig | 2 +- templates/dart/lib/src/models/model.dart.twig | 2 +- templates/dart/lib/src/models/model_base.dart.twig | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/dart/lib/id.dart.twig b/templates/dart/lib/id.dart.twig index 4d880aff9..8fc963d6b 100644 --- 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 index 746b31ba8..4cf288b18 100644 --- 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 index 4fe939e8c..18d7ac83b 100644 --- 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 index e4c968965..c8697f3ca 100644 --- 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 index 0b522738a..ae930dbba 100644 --- 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 index 10ab94833..f11d32adc 100644 --- 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 index 6638c55be..3ce581e20 100644 --- 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{% 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 index eedb851c9..1a8c85069 100644 --- 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 toMap(); From 5c94f8107579398e672c0f82c3513e51575bdeaa Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Sun, 10 Mar 2024 02:11:47 +0000 Subject: [PATCH 15/16] fix flutter part of --- templates/flutter/lib/services/service.dart.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/flutter/lib/services/service.dart.twig b/templates/flutter/lib/services/service.dart.twig index e03257834..206045105 100644 --- 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 %} From 16313a467c260ac5857a724afffec460f9db2008 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Sun, 10 Mar 2024 02:15:25 +0000 Subject: [PATCH 16/16] fix path --- templates/dart/lib/src/models/model_base.dart.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/dart/lib/src/models/model_base.dart.twig b/templates/dart/lib/src/models/model_base.dart.twig index 1a8c85069..48e5b84ae 100644 --- 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 '../models.dart'; +part of '../../models.dart'; abstract class Model { Map toMap();