From 906756f2b599d590ee223f8fb341706bfd4ef55d Mon Sep 17 00:00:00 2001 From: Dillon Nys Date: Fri, 1 Sep 2023 09:16:11 -0700 Subject: [PATCH 1/7] chore(repo): Bump Dart SDK to `3.0.6` And Flutter to `3.10.6` in incorporate fixes for some JS bugs and without breaking users. --- .github/ISSUE_TEMPLATE/BUG-REPORT.yaml | 4 ++-- .github/workflows/amplify_canaries.yaml | 6 +++--- .github/workflows/dart_dart2js.yaml | 2 +- .github/workflows/dart_ddc.yaml | 2 +- .github/workflows/dart_vm.yaml | 2 +- .github/workflows/flutter_vm.yaml | 2 +- canaries/pubspec.yaml | 4 ++-- infra/pubspec.yaml | 2 +- packages/aft/pubspec.yaml | 2 +- packages/amplify/amplify_flutter/example/pubspec.yaml | 4 ++-- packages/amplify/amplify_flutter/pubspec.yaml | 4 ++-- packages/amplify_core/doc/pubspec.yaml | 4 ++-- packages/amplify_core/pubspec.yaml | 2 +- packages/amplify_datastore/example/pubspec.yaml | 4 ++-- packages/amplify_datastore/pubspec.yaml | 4 ++-- packages/amplify_datastore_plugin_interface/pubspec.yaml | 4 ++-- packages/amplify_lints/pubspec.yaml | 2 +- packages/amplify_native_legacy_wrapper/example/pubspec.yaml | 4 ++-- packages/amplify_native_legacy_wrapper/pubspec.yaml | 4 ++-- .../amplify_analytics_pinpoint/example/pubspec.yaml | 4 ++-- packages/analytics/amplify_analytics_pinpoint/pubspec.yaml | 4 ++-- .../analytics/amplify_analytics_pinpoint_dart/pubspec.yaml | 2 +- packages/api/amplify_api/example/pubspec.yaml | 4 ++-- packages/api/amplify_api/pubspec.yaml | 4 ++-- packages/api/amplify_api_dart/pubspec.yaml | 2 +- packages/auth/amplify_auth_cognito/example/pubspec.yaml | 4 ++-- packages/auth/amplify_auth_cognito/pubspec.yaml | 4 ++-- .../auth/amplify_auth_cognito_dart/example/pubspec.yaml | 2 +- packages/auth/amplify_auth_cognito_dart/pubspec.yaml | 2 +- packages/auth/amplify_auth_cognito_test/pubspec.yaml | 2 +- .../amplify_authenticator/example/pubspec.yaml | 4 ++-- packages/authenticator/amplify_authenticator/pubspec.yaml | 4 ++-- .../authenticator/amplify_authenticator_test/pubspec.yaml | 4 ++-- packages/aws_common/pubspec.yaml | 2 +- packages/aws_sdk/smoke_test/pubspec.yaml | 2 +- packages/aws_signature_v4/example/pubspec.yaml | 2 +- packages/aws_signature_v4/pubspec.yaml | 2 +- packages/common/amplify_db_common/example/pubspec.yaml | 4 ++-- packages/common/amplify_db_common/pubspec.yaml | 4 ++-- packages/common/amplify_db_common_dart/example/pubspec.yaml | 2 +- packages/common/amplify_db_common_dart/pubspec.yaml | 2 +- packages/example_common/example/pubspec.yaml | 2 +- packages/example_common/pubspec.yaml | 2 +- .../push/amplify_push_notifications/example/pubspec.yaml | 4 ++-- .../push/amplify_push_notifications/pubspec.yaml | 4 ++-- .../example/pubspec.yaml | 4 ++-- .../push/amplify_push_notifications_pinpoint/pubspec.yaml | 4 ++-- .../amplify_secure_storage/example/pubspec.yaml | 4 ++-- packages/secure_storage/amplify_secure_storage/pubspec.yaml | 4 ++-- .../amplify_secure_storage_dart/example/pubspec.yaml | 2 +- .../secure_storage/amplify_secure_storage_dart/pubspec.yaml | 2 +- .../secure_storage/amplify_secure_storage_test/pubspec.yaml | 2 +- packages/smithy/goldens/lib/awsJson1_0/pubspec.yaml | 2 +- packages/smithy/goldens/lib/awsJson1_1/pubspec.yaml | 2 +- packages/smithy/goldens/lib/awsQuery/pubspec.yaml | 2 +- packages/smithy/goldens/lib/ec2Query/pubspec.yaml | 2 +- packages/smithy/goldens/lib/restJson1/pubspec.yaml | 2 +- packages/smithy/goldens/lib/restXml/pubspec.yaml | 2 +- .../smithy/goldens/lib/restXmlWithNamespace/pubspec.yaml | 2 +- packages/smithy/goldens/lib2/awsJson1_0/pubspec.yaml | 2 +- packages/smithy/goldens/lib2/awsJson1_1/pubspec.yaml | 2 +- packages/smithy/goldens/lib2/awsQuery/pubspec.yaml | 2 +- packages/smithy/goldens/lib2/custom/pubspec.yaml | 2 +- packages/smithy/goldens/lib2/ec2Query/pubspec.yaml | 2 +- packages/smithy/goldens/lib2/restJson1/pubspec.yaml | 2 +- packages/smithy/goldens/lib2/restXml/pubspec.yaml | 2 +- .../smithy/goldens/lib2/restXmlWithNamespace/pubspec.yaml | 2 +- packages/smithy/goldens/pubspec.yaml | 2 +- packages/smithy/smithy/pubspec.yaml | 2 +- packages/smithy/smithy_aws/pubspec.yaml | 2 +- packages/smithy/smithy_codegen/pubspec.yaml | 2 +- packages/smithy/smithy_test/pubspec.yaml | 2 +- packages/storage/amplify_storage_s3/example/pubspec.yaml | 4 ++-- packages/storage/amplify_storage_s3/pubspec.yaml | 4 ++-- .../storage/amplify_storage_s3_dart/example/pubspec.yaml | 2 +- packages/storage/amplify_storage_s3_dart/pubspec.yaml | 2 +- packages/test/amplify_auth_integration_test/pubspec.yaml | 4 ++-- packages/test/amplify_integration_test/pubspec.yaml | 2 +- packages/test/amplify_test/pubspec.yaml | 2 +- packages/test/pub_server/pubspec.yaml | 2 +- packages/worker_bee/e2e/pubspec.yaml | 2 +- packages/worker_bee/e2e_flutter_test/pubspec.yaml | 4 ++-- packages/worker_bee/e2e_test/pubspec.yaml | 2 +- packages/worker_bee/worker_bee/pubspec.yaml | 2 +- packages/worker_bee/worker_bee_builder/pubspec.yaml | 2 +- pubspec.yaml | 4 ++-- templates/dart-package/hooks/pubspec.yaml | 2 +- templates/flutter-package/hooks/pubspec.yaml | 2 +- 88 files changed, 122 insertions(+), 122 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT.yaml b/.github/ISSUE_TEMPLATE/BUG-REPORT.yaml index 529d792d43..6f034dc1b3 100644 --- a/.github/ISSUE_TEMPLATE/BUG-REPORT.yaml +++ b/.github/ISSUE_TEMPLATE/BUG-REPORT.yaml @@ -79,7 +79,7 @@ body: attributes: label: "Flutter Version" description: "Please share which version of Flutter you're using (found using `flutter --version`)." - placeholder: "3.3.10" + placeholder: "3.10.6" validations: required: true - type: input @@ -87,7 +87,7 @@ body: attributes: label: Amplify Flutter Version description: "The version of the Amplify Flutter libraries you're currently using." - placeholder: "0.6.10" + placeholder: "1.4.0" validations: required: true - type: dropdown diff --git a/.github/workflows/amplify_canaries.yaml b/.github/workflows/amplify_canaries.yaml index 6fadbaf584..8420a229d9 100644 --- a/.github/workflows/amplify_canaries.yaml +++ b/.github/workflows/amplify_canaries.yaml @@ -31,7 +31,7 @@ jobs: - "any" # latest include: - channel: "stable" - flutter-version: "3.10.1" + flutter-version: "3.10.6" steps: - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # 3.6.0 with: @@ -91,7 +91,7 @@ jobs: - "any" # latest include: - channel: "stable" - flutter-version: "3.10.1" + flutter-version: "3.10.6" steps: - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # 3.6.0 with: @@ -165,7 +165,7 @@ jobs: - "any" # latest include: - channel: "stable" - flutter-version: "3.10.1" + flutter-version: "3.10.6" ios-version: - "14.5" - "16" diff --git a/.github/workflows/dart_dart2js.yaml b/.github/workflows/dart_dart2js.yaml index f5cb782ec9..dc65a76ad7 100644 --- a/.github/workflows/dart_dart2js.yaml +++ b/.github/workflows/dart_dart2js.yaml @@ -24,7 +24,7 @@ jobs: matrix: sdk: # Minimum supported Dart version - - "3.0.1" + - "3.0.6" - stable - beta browser: diff --git a/.github/workflows/dart_ddc.yaml b/.github/workflows/dart_ddc.yaml index 3e9524b552..906b186d94 100644 --- a/.github/workflows/dart_ddc.yaml +++ b/.github/workflows/dart_ddc.yaml @@ -24,7 +24,7 @@ jobs: matrix: sdk: # Minimum supported Dart version - - "3.0.1" + - "3.0.6" - stable - beta browser: diff --git a/.github/workflows/dart_vm.yaml b/.github/workflows/dart_vm.yaml index cdc021f0f2..e4e736c7a4 100644 --- a/.github/workflows/dart_vm.yaml +++ b/.github/workflows/dart_vm.yaml @@ -22,7 +22,7 @@ jobs: matrix: sdk: # Minimum supported Dart version - - "3.0.1" + - "3.0.6" - stable - beta steps: diff --git a/.github/workflows/flutter_vm.yaml b/.github/workflows/flutter_vm.yaml index 21c25c42e7..870145ecbb 100644 --- a/.github/workflows/flutter_vm.yaml +++ b/.github/workflows/flutter_vm.yaml @@ -31,7 +31,7 @@ jobs: - "any" # latest include: - channel: "stable" - flutter-version: "3.10.1" + flutter-version: "3.10.6" steps: - name: Git Checkout uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # 3.6.0 diff --git a/canaries/pubspec.yaml b/canaries/pubspec.yaml index 1805378c2e..43e127bd33 100644 --- a/canaries/pubspec.yaml +++ b/canaries/pubspec.yaml @@ -2,8 +2,8 @@ name: amplified_todo publish_to: none environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: amplify_analytics_pinpoint: ^1.0.0 diff --git a/infra/pubspec.yaml b/infra/pubspec.yaml index 0a2f76fe17..16cb682e3b 100644 --- a/infra/pubspec.yaml +++ b/infra/pubspec.yaml @@ -2,7 +2,7 @@ name: infra publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: amplify_core: any diff --git a/packages/aft/pubspec.yaml b/packages/aft/pubspec.yaml index f5aa941441..bb6830e840 100644 --- a/packages/aft/pubspec.yaml +++ b/packages/aft/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.1 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: args: ^2.3.0 diff --git a/packages/amplify/amplify_flutter/example/pubspec.yaml b/packages/amplify/amplify_flutter/example/pubspec.yaml index 8ee45f063b..77e79f349c 100644 --- a/packages/amplify/amplify_flutter/example/pubspec.yaml +++ b/packages/amplify/amplify_flutter/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the Amplify Flutter client libraries. publish_to: none environment: - flutter: ">=3.10.0" - sdk: ^3.0.0 + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: amplify_analytics_pinpoint: ">=1.0.0-next.8 <1.0.0-next.9" diff --git a/packages/amplify/amplify_flutter/pubspec.yaml b/packages/amplify/amplify_flutter/pubspec.yaml index 73daccf522..bc08cc8c34 100644 --- a/packages/amplify/amplify_flutter/pubspec.yaml +++ b/packages/amplify/amplify_flutter/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/am issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" # Helps `pana` since we do not use Flutter plugins for most platforms platforms: diff --git a/packages/amplify_core/doc/pubspec.yaml b/packages/amplify_core/doc/pubspec.yaml index f1c9ecf40c..8410589696 100644 --- a/packages/amplify_core/doc/pubspec.yaml +++ b/packages/amplify_core/doc/pubspec.yaml @@ -7,8 +7,8 @@ issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues publish_to: none environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: amplify_analytics_pinpoint: any diff --git a/packages/amplify_core/pubspec.yaml b/packages/amplify_core/pubspec.yaml index 80a0c48487..64cbcfe666 100644 --- a/packages/amplify_core/pubspec.yaml +++ b/packages/amplify_core/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/am issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: async: ^2.10.0 diff --git a/packages/amplify_datastore/example/pubspec.yaml b/packages/amplify_datastore/example/pubspec.yaml index 2401d09014..fe252b5f6e 100644 --- a/packages/amplify_datastore/example/pubspec.yaml +++ b/packages/amplify_datastore/example/pubspec.yaml @@ -6,8 +6,8 @@ description: Demonstrates how to use the amplify_datastore plugin. publish_to: "none" # Remove this line if you wish to publish to pub.dev environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: flutter: diff --git a/packages/amplify_datastore/pubspec.yaml b/packages/amplify_datastore/pubspec.yaml index d9b2ba08b1..9bb985547d 100644 --- a/packages/amplify_datastore/pubspec.yaml +++ b/packages/amplify_datastore/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/am issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: flutter: diff --git a/packages/amplify_datastore_plugin_interface/pubspec.yaml b/packages/amplify_datastore_plugin_interface/pubspec.yaml index 297ec8288c..18ed1ae9c7 100644 --- a/packages/amplify_datastore_plugin_interface/pubspec.yaml +++ b/packages/amplify_datastore_plugin_interface/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/am issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: amplify_core: ">=1.3.2 <1.4.0" diff --git a/packages/amplify_lints/pubspec.yaml b/packages/amplify_lints/pubspec.yaml index caec621d36..ba6bc30a54 100644 --- a/packages/amplify_lints/pubspec.yaml +++ b/packages/amplify_lints/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/am issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: flutter_lints: ^2.0.0 diff --git a/packages/amplify_native_legacy_wrapper/example/pubspec.yaml b/packages/amplify_native_legacy_wrapper/example/pubspec.yaml index a12c2bdb2a..e29a0a5ff7 100644 --- a/packages/amplify_native_legacy_wrapper/example/pubspec.yaml +++ b/packages/amplify_native_legacy_wrapper/example/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.1.0 publish_to: "none" environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: amplify_native_legacy_wrapper: ^0.1.0 diff --git a/packages/amplify_native_legacy_wrapper/pubspec.yaml b/packages/amplify_native_legacy_wrapper/pubspec.yaml index 60ae63baf5..04d9d41a13 100644 --- a/packages/amplify_native_legacy_wrapper/pubspec.yaml +++ b/packages/amplify_native_legacy_wrapper/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: flutter: diff --git a/packages/analytics/amplify_analytics_pinpoint/example/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint/example/pubspec.yaml index 0110616960..3ccaaf28a1 100644 --- a/packages/analytics/amplify_analytics_pinpoint/example/pubspec.yaml +++ b/packages/analytics/amplify_analytics_pinpoint/example/pubspec.yaml @@ -6,8 +6,8 @@ description: Demonstrates how to use the amplify_analytics_pinpoint plugin. publish_to: "none" # Remove this line if you wish to publish to pub.dev environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: amplify_analytics_pinpoint: ">=1.0.0-next.8 <1.0.0-next.9" diff --git a/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml index 6ec575b6a4..f96dcc979a 100644 --- a/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml +++ b/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/an issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" # Helps `pana` since we do not use Flutter plugins for most platforms platforms: diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml index b8e0d8751c..83b274ba8f 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml +++ b/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/an issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: amplify_core: ">=1.3.2 <1.4.0" diff --git a/packages/api/amplify_api/example/pubspec.yaml b/packages/api/amplify_api/example/pubspec.yaml index 80732c0bab..2b7f07ce0b 100644 --- a/packages/api/amplify_api/example/pubspec.yaml +++ b/packages/api/amplify_api/example/pubspec.yaml @@ -6,8 +6,8 @@ description: Demonstrates how to use the amplify_api plugin. publish_to: "none" # Remove this line if you wish to publish to pub.dev environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: amplify_api: ">=1.0.0-next.8 <1.0.0-next.9" diff --git a/packages/api/amplify_api/pubspec.yaml b/packages/api/amplify_api/pubspec.yaml index dba5bc9ad8..c97a26cb83 100644 --- a/packages/api/amplify_api/pubspec.yaml +++ b/packages/api/amplify_api/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/ap issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" # Helps `pana` since we do not use Flutter plugins for most platforms platforms: diff --git a/packages/api/amplify_api_dart/pubspec.yaml b/packages/api/amplify_api_dart/pubspec.yaml index e26862c534..905651ade1 100644 --- a/packages/api/amplify_api_dart/pubspec.yaml +++ b/packages/api/amplify_api_dart/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/ap issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: amplify_core: ">=1.3.2 <1.4.0" diff --git a/packages/auth/amplify_auth_cognito/example/pubspec.yaml b/packages/auth/amplify_auth_cognito/example/pubspec.yaml index ddc36409fe..216f224bcd 100644 --- a/packages/auth/amplify_auth_cognito/example/pubspec.yaml +++ b/packages/auth/amplify_auth_cognito/example/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: amplify_api: any diff --git a/packages/auth/amplify_auth_cognito/pubspec.yaml b/packages/auth/amplify_auth_cognito/pubspec.yaml index bd3d90f391..fb9c8106a0 100644 --- a/packages/auth/amplify_auth_cognito/pubspec.yaml +++ b/packages/auth/amplify_auth_cognito/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/au issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" # Helps `pana` since we do not use Flutter plugins for most platforms platforms: diff --git a/packages/auth/amplify_auth_cognito_dart/example/pubspec.yaml b/packages/auth/amplify_auth_cognito_dart/example/pubspec.yaml index a7ed2a998f..2249aff1be 100644 --- a/packages/auth/amplify_auth_cognito_dart/example/pubspec.yaml +++ b/packages/auth/amplify_auth_cognito_dart/example/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: amplify_auth_cognito_dart: any diff --git a/packages/auth/amplify_auth_cognito_dart/pubspec.yaml b/packages/auth/amplify_auth_cognito_dart/pubspec.yaml index e5731fc14c..fe50d252ba 100644 --- a/packages/auth/amplify_auth_cognito_dart/pubspec.yaml +++ b/packages/auth/amplify_auth_cognito_dart/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/next/packages/au issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: amplify_analytics_pinpoint_dart: ">=0.3.0+5 <0.4.0" diff --git a/packages/auth/amplify_auth_cognito_test/pubspec.yaml b/packages/auth/amplify_auth_cognito_test/pubspec.yaml index 6608e869f5..cdbb21bde0 100644 --- a/packages/auth/amplify_auth_cognito_test/pubspec.yaml +++ b/packages/auth/amplify_auth_cognito_test/pubspec.yaml @@ -3,7 +3,7 @@ description: Tests for the amplify_auth_cognito_dart package. publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: amplify_analytics_pinpoint_dart: any diff --git a/packages/authenticator/amplify_authenticator/example/pubspec.yaml b/packages/authenticator/amplify_authenticator/example/pubspec.yaml index dc95b92beb..ce1543516d 100644 --- a/packages/authenticator/amplify_authenticator/example/pubspec.yaml +++ b/packages/authenticator/amplify_authenticator/example/pubspec.yaml @@ -18,8 +18,8 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: amplify_auth_cognito: ">=1.0.0-next.8 <1.0.0-next.9" diff --git a/packages/authenticator/amplify_authenticator/pubspec.yaml b/packages/authenticator/amplify_authenticator/pubspec.yaml index 4dc7b624b7..44194083f2 100644 --- a/packages/authenticator/amplify_authenticator/pubspec.yaml +++ b/packages/authenticator/amplify_authenticator/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/au issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: amplify_auth_cognito: ">=1.3.2 <1.4.0" diff --git a/packages/authenticator/amplify_authenticator_test/pubspec.yaml b/packages/authenticator/amplify_authenticator_test/pubspec.yaml index e51dde12c9..92f7452efe 100644 --- a/packages/authenticator/amplify_authenticator_test/pubspec.yaml +++ b/packages/authenticator/amplify_authenticator_test/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: amplify_authenticator: any diff --git a/packages/aws_common/pubspec.yaml b/packages/aws_common/pubspec.yaml index 20d114b72a..aefd57a66e 100644 --- a/packages/aws_common/pubspec.yaml +++ b/packages/aws_common/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/aw issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: async: ^2.10.0 diff --git a/packages/aws_sdk/smoke_test/pubspec.yaml b/packages/aws_sdk/smoke_test/pubspec.yaml index 4f6f4d4132..a00c1664e0 100644 --- a/packages/aws_sdk/smoke_test/pubspec.yaml +++ b/packages/aws_sdk/smoke_test/pubspec.yaml @@ -3,7 +3,7 @@ description: Smoke test testbed for the AWS SDK for Dart publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: aws_common: ">=0.5.0 <0.6.0" diff --git a/packages/aws_signature_v4/example/pubspec.yaml b/packages/aws_signature_v4/example/pubspec.yaml index 53cd505778..f8d7b20171 100644 --- a/packages/aws_signature_v4/example/pubspec.yaml +++ b/packages/aws_signature_v4/example/pubspec.yaml @@ -2,7 +2,7 @@ name: example publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: args: ^2.3.0 diff --git a/packages/aws_signature_v4/pubspec.yaml b/packages/aws_signature_v4/pubspec.yaml index 4a9b675fdf..6b05c12fe2 100644 --- a/packages/aws_signature_v4/pubspec.yaml +++ b/packages/aws_signature_v4/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/aw issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: async: ^2.10.0 diff --git a/packages/common/amplify_db_common/example/pubspec.yaml b/packages/common/amplify_db_common/example/pubspec.yaml index 7d54bac97a..c43d84498a 100644 --- a/packages/common/amplify_db_common/example/pubspec.yaml +++ b/packages/common/amplify_db_common/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the amplify_db_common plugin. publish_to: "none" environment: - flutter: ">=3.10.0" - sdk: ^3.0.0 + flutter: ">=3.10.6" + sdk: ^3.0.6 dependencies: amplify_db_common: ">=0.1.2+5 <0.2.0" diff --git a/packages/common/amplify_db_common/pubspec.yaml b/packages/common/amplify_db_common/pubspec.yaml index d102e9d791..c4d79e5431 100644 --- a/packages/common/amplify_db_common/pubspec.yaml +++ b/packages/common/amplify_db_common/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/co issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: amplify_db_common_dart: ">=0.3.0+5 <0.4.0" diff --git a/packages/common/amplify_db_common_dart/example/pubspec.yaml b/packages/common/amplify_db_common_dart/example/pubspec.yaml index af2e32054e..278139c653 100644 --- a/packages/common/amplify_db_common_dart/example/pubspec.yaml +++ b/packages/common/amplify_db_common_dart/example/pubspec.yaml @@ -7,7 +7,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: amplify_db_common_dart: ">=0.2.0+5 <0.3.0" diff --git a/packages/common/amplify_db_common_dart/pubspec.yaml b/packages/common/amplify_db_common_dart/pubspec.yaml index 8f82b10d5d..dd15fcbd0e 100644 --- a/packages/common/amplify_db_common_dart/pubspec.yaml +++ b/packages/common/amplify_db_common_dart/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/co issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: amplify_core: ">=1.3.2 <1.4.0" diff --git a/packages/example_common/example/pubspec.yaml b/packages/example_common/example/pubspec.yaml index 0b93f508f7..0c8ac02ed1 100644 --- a/packages/example_common/example/pubspec.yaml +++ b/packages/example_common/example/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: example_common: diff --git a/packages/example_common/pubspec.yaml b/packages/example_common/pubspec.yaml index d38d4cfb91..33926a98ef 100644 --- a/packages/example_common/pubspec.yaml +++ b/packages/example_common/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: meta: ^1.7.0 diff --git a/packages/notifications/push/amplify_push_notifications/example/pubspec.yaml b/packages/notifications/push/amplify_push_notifications/example/pubspec.yaml index 04d181afcd..4c49278010 100644 --- a/packages/notifications/push/amplify_push_notifications/example/pubspec.yaml +++ b/packages/notifications/push/amplify_push_notifications/example/pubspec.yaml @@ -4,8 +4,8 @@ publish_to: "none" version: 0.1.0 environment: - flutter: ">=3.10.0" - sdk: ">=3.0.0 <4.0.0" + flutter: ">=3.10.6" + sdk: ^3.0.6 dependencies: amplify_push_notifications: diff --git a/packages/notifications/push/amplify_push_notifications/pubspec.yaml b/packages/notifications/push/amplify_push_notifications/pubspec.yaml index fb4e4c7136..70cf96d36d 100644 --- a/packages/notifications/push/amplify_push_notifications/pubspec.yaml +++ b/packages/notifications/push/amplify_push_notifications/pubspec.yaml @@ -5,8 +5,8 @@ homepage: https://docs.amplify.aws/lib/q/platform/flutter/ issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: amplify_core: ">=1.3.3 <1.4.0" diff --git a/packages/notifications/push/amplify_push_notifications_pinpoint/example/pubspec.yaml b/packages/notifications/push/amplify_push_notifications_pinpoint/example/pubspec.yaml index 490168dd10..1f73ee8623 100644 --- a/packages/notifications/push/amplify_push_notifications_pinpoint/example/pubspec.yaml +++ b/packages/notifications/push/amplify_push_notifications_pinpoint/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the amplify_push_notifications_pinpoint plu publish_to: "none" # Remove this line if you wish to publish to pub.dev environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: amplify_auth_cognito: ">=1.0.0-next.8 <1.0.0-next.9" diff --git a/packages/notifications/push/amplify_push_notifications_pinpoint/pubspec.yaml b/packages/notifications/push/amplify_push_notifications_pinpoint/pubspec.yaml index f4d85798a2..28dde1ecf3 100644 --- a/packages/notifications/push/amplify_push_notifications_pinpoint/pubspec.yaml +++ b/packages/notifications/push/amplify_push_notifications_pinpoint/pubspec.yaml @@ -5,8 +5,8 @@ homepage: https://docs.amplify.aws/lib/q/platform/flutter/ issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" # Helps `pana` since it does not detect Android support. platforms: diff --git a/packages/secure_storage/amplify_secure_storage/example/pubspec.yaml b/packages/secure_storage/amplify_secure_storage/example/pubspec.yaml index 5cf040b766..b21acbbad2 100644 --- a/packages/secure_storage/amplify_secure_storage/example/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage/example/pubspec.yaml @@ -4,8 +4,8 @@ description: Demonstrates how to use the amplify_secure_storage plugin and house publish_to: "none" environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: amplify_secure_storage: ">=0.3.0 <0.4.0" diff --git a/packages/secure_storage/amplify_secure_storage/pubspec.yaml b/packages/secure_storage/amplify_secure_storage/pubspec.yaml index c555f754ee..af043dcdf1 100644 --- a/packages/secure_storage/amplify_secure_storage/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/se issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: amplify_secure_storage_dart: ">=0.4.0+5 <0.5.0" diff --git a/packages/secure_storage/amplify_secure_storage_dart/example/pubspec.yaml b/packages/secure_storage/amplify_secure_storage_dart/example/pubspec.yaml index f68ce3c780..749b874071 100644 --- a/packages/secure_storage/amplify_secure_storage_dart/example/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage_dart/example/pubspec.yaml @@ -7,7 +7,7 @@ version: 1.0.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: amplify_secure_storage_dart: ">=0.3.0 <0.4.0" diff --git a/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml b/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml index f5802e2c13..e5772d8c1a 100644 --- a/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/se issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 + sdk: ^3.0.6 # Explicitly declare platform support to help `pana` platforms: diff --git a/packages/secure_storage/amplify_secure_storage_test/pubspec.yaml b/packages/secure_storage/amplify_secure_storage_test/pubspec.yaml index 6930b38db9..5d25a44aab 100644 --- a/packages/secure_storage/amplify_secure_storage_test/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage_test/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: amplify_secure_storage_dart: any diff --git a/packages/smithy/goldens/lib/awsJson1_0/pubspec.yaml b/packages/smithy/goldens/lib/awsJson1_0/pubspec.yaml index bab3ba27a4..7bb571850b 100644 --- a/packages/smithy/goldens/lib/awsJson1_0/pubspec.yaml +++ b/packages/smithy/goldens/lib/awsJson1_0/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: smithy: diff --git a/packages/smithy/goldens/lib/awsJson1_1/pubspec.yaml b/packages/smithy/goldens/lib/awsJson1_1/pubspec.yaml index b6ffb036da..5f564c0b56 100644 --- a/packages/smithy/goldens/lib/awsJson1_1/pubspec.yaml +++ b/packages/smithy/goldens/lib/awsJson1_1/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: smithy: diff --git a/packages/smithy/goldens/lib/awsQuery/pubspec.yaml b/packages/smithy/goldens/lib/awsQuery/pubspec.yaml index 75c4dae444..972e78cf17 100644 --- a/packages/smithy/goldens/lib/awsQuery/pubspec.yaml +++ b/packages/smithy/goldens/lib/awsQuery/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: smithy: diff --git a/packages/smithy/goldens/lib/ec2Query/pubspec.yaml b/packages/smithy/goldens/lib/ec2Query/pubspec.yaml index 3a7ea01d3a..c06e89f316 100644 --- a/packages/smithy/goldens/lib/ec2Query/pubspec.yaml +++ b/packages/smithy/goldens/lib/ec2Query/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: smithy: diff --git a/packages/smithy/goldens/lib/restJson1/pubspec.yaml b/packages/smithy/goldens/lib/restJson1/pubspec.yaml index b18d06c2ac..56770db055 100644 --- a/packages/smithy/goldens/lib/restJson1/pubspec.yaml +++ b/packages/smithy/goldens/lib/restJson1/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: smithy: diff --git a/packages/smithy/goldens/lib/restXml/pubspec.yaml b/packages/smithy/goldens/lib/restXml/pubspec.yaml index f457a8cd7b..0c32ace783 100644 --- a/packages/smithy/goldens/lib/restXml/pubspec.yaml +++ b/packages/smithy/goldens/lib/restXml/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: smithy: diff --git a/packages/smithy/goldens/lib/restXmlWithNamespace/pubspec.yaml b/packages/smithy/goldens/lib/restXmlWithNamespace/pubspec.yaml index 57c73814fd..5395d32d53 100644 --- a/packages/smithy/goldens/lib/restXmlWithNamespace/pubspec.yaml +++ b/packages/smithy/goldens/lib/restXmlWithNamespace/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: smithy: diff --git a/packages/smithy/goldens/lib2/awsJson1_0/pubspec.yaml b/packages/smithy/goldens/lib2/awsJson1_0/pubspec.yaml index 8c5b529ee9..1617866509 100644 --- a/packages/smithy/goldens/lib2/awsJson1_0/pubspec.yaml +++ b/packages/smithy/goldens/lib2/awsJson1_0/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: smithy: diff --git a/packages/smithy/goldens/lib2/awsJson1_1/pubspec.yaml b/packages/smithy/goldens/lib2/awsJson1_1/pubspec.yaml index 0013d22415..d2682f1d52 100644 --- a/packages/smithy/goldens/lib2/awsJson1_1/pubspec.yaml +++ b/packages/smithy/goldens/lib2/awsJson1_1/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: smithy: diff --git a/packages/smithy/goldens/lib2/awsQuery/pubspec.yaml b/packages/smithy/goldens/lib2/awsQuery/pubspec.yaml index d847ace1d8..6d1660b355 100644 --- a/packages/smithy/goldens/lib2/awsQuery/pubspec.yaml +++ b/packages/smithy/goldens/lib2/awsQuery/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: smithy: diff --git a/packages/smithy/goldens/lib2/custom/pubspec.yaml b/packages/smithy/goldens/lib2/custom/pubspec.yaml index bf526f2b4f..469f100c93 100644 --- a/packages/smithy/goldens/lib2/custom/pubspec.yaml +++ b/packages/smithy/goldens/lib2/custom/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: smithy: diff --git a/packages/smithy/goldens/lib2/ec2Query/pubspec.yaml b/packages/smithy/goldens/lib2/ec2Query/pubspec.yaml index 6f71d46cd7..dc3df5d917 100644 --- a/packages/smithy/goldens/lib2/ec2Query/pubspec.yaml +++ b/packages/smithy/goldens/lib2/ec2Query/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: smithy: diff --git a/packages/smithy/goldens/lib2/restJson1/pubspec.yaml b/packages/smithy/goldens/lib2/restJson1/pubspec.yaml index bd50ac2441..c5fc629ae9 100644 --- a/packages/smithy/goldens/lib2/restJson1/pubspec.yaml +++ b/packages/smithy/goldens/lib2/restJson1/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: smithy: diff --git a/packages/smithy/goldens/lib2/restXml/pubspec.yaml b/packages/smithy/goldens/lib2/restXml/pubspec.yaml index 49a1810578..85644c7540 100644 --- a/packages/smithy/goldens/lib2/restXml/pubspec.yaml +++ b/packages/smithy/goldens/lib2/restXml/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: smithy: diff --git a/packages/smithy/goldens/lib2/restXmlWithNamespace/pubspec.yaml b/packages/smithy/goldens/lib2/restXmlWithNamespace/pubspec.yaml index f00a3f0a3a..50d892e3fe 100644 --- a/packages/smithy/goldens/lib2/restXmlWithNamespace/pubspec.yaml +++ b/packages/smithy/goldens/lib2/restXmlWithNamespace/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: smithy: diff --git a/packages/smithy/goldens/pubspec.yaml b/packages/smithy/goldens/pubspec.yaml index f69aebcf0b..4f7fa04fc7 100644 --- a/packages/smithy/goldens/pubspec.yaml +++ b/packages/smithy/goldens/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: aws_common: ^0.5.0+2 diff --git a/packages/smithy/smithy/pubspec.yaml b/packages/smithy/smithy/pubspec.yaml index 79501c6f64..2a53ba3138 100644 --- a/packages/smithy/smithy/pubspec.yaml +++ b/packages/smithy/smithy/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/sm issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: async: ^2.10.0 diff --git a/packages/smithy/smithy_aws/pubspec.yaml b/packages/smithy/smithy_aws/pubspec.yaml index 641161be28..3d33b0f249 100644 --- a/packages/smithy/smithy_aws/pubspec.yaml +++ b/packages/smithy/smithy_aws/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/sm issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: aws_common: ">=0.6.0 <0.7.0" diff --git a/packages/smithy/smithy_codegen/pubspec.yaml b/packages/smithy/smithy_codegen/pubspec.yaml index 026040e665..c68e1c7a78 100644 --- a/packages/smithy/smithy_codegen/pubspec.yaml +++ b/packages/smithy/smithy_codegen/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/sm publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: args: ^2.3.0 diff --git a/packages/smithy/smithy_test/pubspec.yaml b/packages/smithy/smithy_test/pubspec.yaml index 92079f47d4..56a39d2b31 100644 --- a/packages/smithy/smithy_test/pubspec.yaml +++ b/packages/smithy/smithy_test/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/sm publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: async: ^2.10.0 diff --git a/packages/storage/amplify_storage_s3/example/pubspec.yaml b/packages/storage/amplify_storage_s3/example/pubspec.yaml index e98981508c..f5ae891ddb 100644 --- a/packages/storage/amplify_storage_s3/example/pubspec.yaml +++ b/packages/storage/amplify_storage_s3/example/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: amplify_auth_cognito: any diff --git a/packages/storage/amplify_storage_s3/pubspec.yaml b/packages/storage/amplify_storage_s3/pubspec.yaml index 0631e3a28d..facb5e6cb9 100644 --- a/packages/storage/amplify_storage_s3/pubspec.yaml +++ b/packages/storage/amplify_storage_s3/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/st issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" # Helps `pana` since we do not use Flutter plugins for most platforms platforms: diff --git a/packages/storage/amplify_storage_s3_dart/example/pubspec.yaml b/packages/storage/amplify_storage_s3_dart/example/pubspec.yaml index 431c6047b5..fc4f21dca4 100644 --- a/packages/storage/amplify_storage_s3_dart/example/pubspec.yaml +++ b/packages/storage/amplify_storage_s3_dart/example/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: amplify_auth_cognito_dart: any diff --git a/packages/storage/amplify_storage_s3_dart/pubspec.yaml b/packages/storage/amplify_storage_s3_dart/pubspec.yaml index 5fa1b15a53..89831432bf 100644 --- a/packages/storage/amplify_storage_s3_dart/pubspec.yaml +++ b/packages/storage/amplify_storage_s3_dart/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/st issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: amplify_core: ">=1.3.2 <1.4.0" diff --git a/packages/test/amplify_auth_integration_test/pubspec.yaml b/packages/test/amplify_auth_integration_test/pubspec.yaml index 3453cc4350..b47a134a13 100644 --- a/packages/test/amplify_auth_integration_test/pubspec.yaml +++ b/packages/test/amplify_auth_integration_test/pubspec.yaml @@ -6,8 +6,8 @@ issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues publish_to: none environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" dependencies: amplify_api: any diff --git a/packages/test/amplify_integration_test/pubspec.yaml b/packages/test/amplify_integration_test/pubspec.yaml index ee490870e8..34e949f4d3 100644 --- a/packages/test/amplify_integration_test/pubspec.yaml +++ b/packages/test/amplify_integration_test/pubspec.yaml @@ -4,7 +4,7 @@ homepage: https://github.com/aws-amplify/amplify-flutter publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: amplify_auth_cognito_dart: any diff --git a/packages/test/amplify_test/pubspec.yaml b/packages/test/amplify_test/pubspec.yaml index c1ec84fa22..4fd5cb4be7 100644 --- a/packages/test/amplify_test/pubspec.yaml +++ b/packages/test/amplify_test/pubspec.yaml @@ -4,7 +4,7 @@ homepage: https://github.com/aws-amplify/amplify-flutter publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: amplify_core: any diff --git a/packages/test/pub_server/pubspec.yaml b/packages/test/pub_server/pubspec.yaml index f25bec7afe..6023cd6c0a 100644 --- a/packages/test/pub_server/pubspec.yaml +++ b/packages/test/pub_server/pubspec.yaml @@ -6,7 +6,7 @@ issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: archive: ^3.3.7 diff --git a/packages/worker_bee/e2e/pubspec.yaml b/packages/worker_bee/e2e/pubspec.yaml index ef07b6e400..a6bf7df14a 100644 --- a/packages/worker_bee/e2e/pubspec.yaml +++ b/packages/worker_bee/e2e/pubspec.yaml @@ -3,7 +3,7 @@ description: E2E tests for the worker_bee package. publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: aws_common: ">=0.4.0 <0.5.0" diff --git a/packages/worker_bee/e2e_flutter_test/pubspec.yaml b/packages/worker_bee/e2e_flutter_test/pubspec.yaml index 1f14bdb2e8..8dc9fc3c51 100644 --- a/packages/worker_bee/e2e_flutter_test/pubspec.yaml +++ b/packages/worker_bee/e2e_flutter_test/pubspec.yaml @@ -4,8 +4,8 @@ publish_to: 'none' version: 1.0.0+1 environment: - flutter: ">=3.10.0" - sdk: ^3.0.0 + flutter: ">=3.10.6" + sdk: ^3.0.6 dependencies: e2e: diff --git a/packages/worker_bee/e2e_test/pubspec.yaml b/packages/worker_bee/e2e_test/pubspec.yaml index fde7caeb19..298db9bc35 100644 --- a/packages/worker_bee/e2e_test/pubspec.yaml +++ b/packages/worker_bee/e2e_test/pubspec.yaml @@ -3,7 +3,7 @@ description: E2E tests for the worker_bee package. publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependency_overrides: aws_common: diff --git a/packages/worker_bee/worker_bee/pubspec.yaml b/packages/worker_bee/worker_bee/pubspec.yaml index f3a60685f8..5a3cf35a59 100644 --- a/packages/worker_bee/worker_bee/pubspec.yaml +++ b/packages/worker_bee/worker_bee/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/wo issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: async: ^2.10.0 diff --git a/packages/worker_bee/worker_bee_builder/pubspec.yaml b/packages/worker_bee/worker_bee_builder/pubspec.yaml index bd250c0019..db6b3fdb92 100644 --- a/packages/worker_bee/worker_bee_builder/pubspec.yaml +++ b/packages/worker_bee/worker_bee_builder/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/wo issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: analyzer: ">=5.1.0 <7.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index e519ff076c..3ece6d277c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,8 +3,8 @@ publish_to: none # The current constraints for Dart and Flutter SDKs. environment: - sdk: ^3.0.0 - flutter: ">=3.10.0" + sdk: ^3.0.6 + flutter: ">=3.10.6" # Global dependency versions for third-party dependencies of # Amplify Flutter projects. These represent the values which diff --git a/templates/dart-package/hooks/pubspec.yaml b/templates/dart-package/hooks/pubspec.yaml index 9d0421ec92..26beda26c8 100644 --- a/templates/dart-package/hooks/pubspec.yaml +++ b/templates/dart-package/hooks/pubspec.yaml @@ -2,7 +2,7 @@ name: dart_package_hooks publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: mason: ">=0.1.0-dev.40 <0.1.0" diff --git a/templates/flutter-package/hooks/pubspec.yaml b/templates/flutter-package/hooks/pubspec.yaml index 5c16de5e40..f310990cd0 100644 --- a/templates/flutter-package/hooks/pubspec.yaml +++ b/templates/flutter-package/hooks/pubspec.yaml @@ -2,7 +2,7 @@ name: flutter_package_hooks publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.0.6 dependencies: mason: ">=0.1.0-dev.40 <0.1.0" From 45d0fa485fc742eba9522fee10b0e6bb1cf49c13 Mon Sep 17 00:00:00 2001 From: Dillon Nys Date: Fri, 1 Sep 2023 09:16:24 -0700 Subject: [PATCH 2/7] chore(smithy): Remove some TODOs --- .../smithy/lib/src/ast/traits/trait.dart | 5 +++-- .../json/big_int_serializer.dart | 13 ++++------- .../serialization/json/int64_serializer.dart | 10 ++++----- .../json/timestamp_serializer.dart | 22 +++++-------------- 4 files changed, 17 insertions(+), 33 deletions(-) diff --git a/packages/smithy/smithy/lib/src/ast/traits/trait.dart b/packages/smithy/smithy/lib/src/ast/traits/trait.dart index 6a1b3ec9d3..de11bad716 100644 --- a/packages/smithy/smithy/lib/src/ast/traits/trait.dart +++ b/packages/smithy/smithy/lib/src/ast/traits/trait.dart @@ -20,10 +20,11 @@ abstract class Trait with AWSEquatable>, AWSSerializable { const Trait(this.shapeId, this.value); + static final _logger = AWSLogger().createChild('SmithyTrait'); + static Trait fromJson(ShapeId shapeId, Object? jsonValue) { if (!serializers.containsKey(shapeId)) { - // TODO(dnys1): Log - safePrint('No serializer found for $shapeId'); + _logger.debug('No serializer found for $shapeId'); return DynamicTrait._(shapeId, jsonValue ?? const {}); } return serializers[shapeId]!(jsonValue); diff --git a/packages/smithy/smithy/lib/src/serialization/json/big_int_serializer.dart b/packages/smithy/smithy/lib/src/serialization/json/big_int_serializer.dart index 67cacebd98..7e0c81b772 100644 --- a/packages/smithy/smithy/lib/src/serialization/json/big_int_serializer.dart +++ b/packages/smithy/smithy/lib/src/serialization/json/big_int_serializer.dart @@ -3,16 +3,11 @@ import 'package:built_value/serializer.dart'; -// TODO(dnys1): Remove when doing so wouldn't crash DDC -// ignore: use_enums -class BigIntSerializer implements PrimitiveSerializer { - const BigIntSerializer._(this._asNum); - - /// Serializes [BigInt] types as a [num]. - static const asNum = BigIntSerializer._(true); +enum BigIntSerializer implements PrimitiveSerializer { + asNum._(true), + asString._(false); - /// Serializes [BigInt] types as a base-10 [String]. - static const asString = BigIntSerializer._(false); + const BigIntSerializer._(this._asNum); final bool _asNum; diff --git a/packages/smithy/smithy/lib/src/serialization/json/int64_serializer.dart b/packages/smithy/smithy/lib/src/serialization/json/int64_serializer.dart index 230d39f601..2fcf3e198f 100644 --- a/packages/smithy/smithy/lib/src/serialization/json/int64_serializer.dart +++ b/packages/smithy/smithy/lib/src/serialization/json/int64_serializer.dart @@ -6,16 +6,14 @@ import 'package:fixnum/fixnum.dart'; enum _Int64Format { number, string } -// TODO(dnys1): Remove when doing so wouldn't crash DDC -// ignore: use_enums -class Int64Serializer implements PrimitiveSerializer { +enum Int64Serializer implements PrimitiveSerializer { + asNum._(_Int64Format.number), + asString._(_Int64Format.string); + const Int64Serializer._(this._format); final _Int64Format _format; - static const asNum = Int64Serializer._(_Int64Format.number); - static const asString = Int64Serializer._(_Int64Format.string); - @override Iterable get types => const [Int64]; diff --git a/packages/smithy/smithy/lib/src/serialization/json/timestamp_serializer.dart b/packages/smithy/smithy/lib/src/serialization/json/timestamp_serializer.dart index bb52754dec..b8652de039 100644 --- a/packages/smithy/smithy/lib/src/serialization/json/timestamp_serializer.dart +++ b/packages/smithy/smithy/lib/src/serialization/json/timestamp_serializer.dart @@ -6,27 +6,17 @@ import 'package:smithy/smithy.dart'; /// A class which handles serialization/deserialization of [Timestamp] objects /// using the predefined formats specified by [TimestampFormat]. -// TODO(dnys1): Remove when doing so wouldn't crash DDC -// ignore: use_enums -class TimestampSerializer implements PrimitiveSerializer { +enum TimestampSerializer implements PrimitiveSerializer { + dateTime._(TimestampFormat.dateTime), + httpDate._(TimestampFormat.httpDate), + epochSeconds._(TimestampFormat.epochSeconds), + unknown._(TimestampFormat.unknown); + const TimestampSerializer._(this.format); /// The format to use for serialization/deserialization. final TimestampFormat format; - /// {@macro smithy.timestamp_format_datetime} - static const dateTime = TimestampSerializer._(TimestampFormat.dateTime); - - /// {@macro smithy.timestamp_format_httpdate} - static const httpDate = TimestampSerializer._(TimestampFormat.httpDate); - - /// {@macro smithy.timestamp_format_epochseconds} - static const epochSeconds = - TimestampSerializer._(TimestampFormat.epochSeconds); - - /// {@macro smithy.timestamp_format_unknown} - static const unknown = TimestampSerializer._(TimestampFormat.unknown); - @override DateTime deserialize( Serializers serializers, From feecd4ad8e4733409bbf7dfb548f22520f338d14 Mon Sep 17 00:00:00 2001 From: Dillon Nys Date: Fri, 1 Sep 2023 09:42:34 -0700 Subject: [PATCH 3/7] chore(api): Fix failing test on web --- .../web_socket/blocs/web_socket_bloc.dart | 7 +- packages/api/amplify_api_dart/test/util.dart | 14 ++-- .../test/web_socket/web_socket_bloc_test.dart | 64 +++++++------------ 3 files changed, 34 insertions(+), 51 deletions(-) diff --git a/packages/api/amplify_api_dart/lib/src/graphql/web_socket/blocs/web_socket_bloc.dart b/packages/api/amplify_api_dart/lib/src/graphql/web_socket/blocs/web_socket_bloc.dart index 3ea504efba..91036b21e6 100644 --- a/packages/api/amplify_api_dart/lib/src/graphql/web_socket/blocs/web_socket_bloc.dart +++ b/packages/api/amplify_api_dart/lib/src/graphql/web_socket/blocs/web_socket_bloc.dart @@ -278,7 +278,7 @@ class WebSocketBloc with AWSDebuggable, AmplifyLoggerMixin { onError: (Object error, StackTrace st) { final exception = NetworkException( 'Exception from WebSocketService.', - underlyingException: error.toString(), + underlyingException: error, ); _shutdownWithException(exception, st); }, @@ -405,10 +405,7 @@ class WebSocketBloc with AWSDebuggable, AmplifyLoggerMixin { } currentState.service - .register( - currentState, - request, - ) + .register(currentState, request) .onError(subscriptionBloc.addResponseError); } diff --git a/packages/api/amplify_api_dart/test/util.dart b/packages/api/amplify_api_dart/test/util.dart index ada83fec74..22c1291b19 100644 --- a/packages/api/amplify_api_dart/test/util.dart +++ b/packages/api/amplify_api_dart/test/util.dart @@ -256,15 +256,17 @@ class MockWebSocketService extends AmplifyWebSocketService { @override Stream init(WebSocketState state) { - if (badInit) { - return Stream.error( - WebSocketChannelException('Mock Web Socket Exception'), - ); - } channel = MockWebSocketChannel(); - sink = channel.sink; + if (badInit) { + Timer.run(() { + channel.controller.addError( + WebSocketChannelException('Mock Web Socket Exception'), + ); + }); + } + return transformStream(channel.stream); } diff --git a/packages/api/amplify_api_dart/test/web_socket/web_socket_bloc_test.dart b/packages/api/amplify_api_dart/test/web_socket/web_socket_bloc_test.dart index cf4ca8f769..3fcf5656a4 100644 --- a/packages/api/amplify_api_dart/test/web_socket/web_socket_bloc_test.dart +++ b/packages/api/amplify_api_dart/test/web_socket/web_socket_bloc_test.dart @@ -336,47 +336,31 @@ void main() { bloc = null; service = null; // service gets closed in bloc }); - test( - 'triggering FailureState on Exception during init', - () async { - final subscribeEvent = SubscribeEvent( - subscriptionRequest, - () { - service!.channel.sink.add(mockDataString); - }, - ); - - final badService = MockWebSocketService(badInit: true); - mockNetworkStreamController = StreamController(); - final bloc = WebSocketBloc( - config: testApiKeyConfig, - authProviderRepo: getTestAuthProviderRepo(), - wsService: badService, - subscriptionOptions: subscriptionOptions, - pollClientOverride: mockPollClient.client, - connectivity: const MockConnectivity(), - ); - - expect( - bloc.stream, - emitsInOrder( - [ - isA(), - isA(), - isA(), - isA(), - isA(), - ], - ), - ); + test('triggering FailureState on Exception during init', () async { + final badService = MockWebSocketService(badInit: true); + mockNetworkStreamController = StreamController(); + final bloc = WebSocketBloc( + config: testApiKeyConfig, + authProviderRepo: getTestAuthProviderRepo(), + wsService: badService, + subscriptionOptions: subscriptionOptions, + pollClientOverride: mockPollClient.client, + connectivity: const MockConnectivity(), + ); - bloc.subscribe( - subscribeEvent, - ); - // TODO(equartey): Fix this test on web - }, - skip: zIsWeb, - ); + expect( + bloc.stream, + emitsInOrder( + [ + isA(), + isA(), + isA(), + isA(), + isA(), + ], + ), + ); + }); test('Exception from service and should return error to user', () async { final subscribeEvent = SubscribeEvent( From 91ab7b884650d0be4d9912ad604408ec65c399f9 Mon Sep 17 00:00:00 2001 From: Dillon Nys Date: Mon, 18 Sep 2023 11:55:37 -0700 Subject: [PATCH 4/7] chore(smithy_test): Clean up analysis errors --- packages/smithy/smithy_test/analysis_options.yaml | 4 ++++ packages/smithy/smithy_test/lib/src/common.dart | 4 ++-- packages/smithy/smithy_test/lib/src/xml/equatable.dart | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/smithy/smithy_test/analysis_options.yaml b/packages/smithy/smithy_test/analysis_options.yaml index 7f605f74d4..8d299085bb 100644 --- a/packages/smithy/smithy_test/analysis_options.yaml +++ b/packages/smithy/smithy_test/analysis_options.yaml @@ -1 +1,5 @@ include: package:amplify_lints/library.yaml + +analyzer: + errors: + implementation_imports: ignore diff --git a/packages/smithy/smithy_test/lib/src/common.dart b/packages/smithy/smithy_test/lib/src/common.dart index 77a3d99423..3e39ed6fef 100644 --- a/packages/smithy/smithy_test/lib/src/common.dart +++ b/packages/smithy/smithy_test/lib/src/common.dart @@ -8,8 +8,8 @@ import 'package:test/test.dart'; /// Creates an AST from [shapes]. SmithyAst createAst(List shapes) { return SmithyAst( - (b) => - b..shapes = ShapeMap({for (var shape in shapes) shape.shapeId: shape}), + (b) => b + ..shapes = ShapeMap({for (final shape in shapes) shape.shapeId: shape}), ); } diff --git a/packages/smithy/smithy_test/lib/src/xml/equatable.dart b/packages/smithy/smithy_test/lib/src/xml/equatable.dart index 6e38fd8a41..c98c9dc855 100644 --- a/packages/smithy/smithy_test/lib/src/xml/equatable.dart +++ b/packages/smithy/smithy_test/lib/src/xml/equatable.dart @@ -26,7 +26,7 @@ class _EquatableVisitor with XmlVisitor { List _children(XmlHasChildren node) => [ ...[...node.childElements] ..sort((a, b) => a.name.local.compareTo(b.name.local)), - ...node.children.where((el) => el is! XmlElement) + ...node.children.where((el) => el is! XmlElement), ]; /// Visit an [XmlName]. @@ -89,9 +89,9 @@ class _EquatableVisitor with XmlVisitor { /// Visit an [XmlText] node. @override void visitText(XmlText node) { - final text = node.text.trim(); + final text = node.value.trim(); if (text.isNotEmpty) { - props.add(node.text); + props.add(node.value); } } } From 62303a1851201ec6c65ce195d937cfcb06947d6e Mon Sep 17 00:00:00 2001 From: Dillon Nys Date: Mon, 18 Sep 2023 11:59:37 -0700 Subject: [PATCH 5/7] chore(integration_test): Clean up analysis errors --- .../analysis_options.yaml | 4 +++ .../analysis_options.yaml | 2 ++ .../lib/amplify_integration_test.dart | 1 - .../types/delete_user_response.dart | 14 --------- .../src/stubs/amplify_auth_cognito_stub.dart | 31 +++++++++---------- 5 files changed, 21 insertions(+), 31 deletions(-) delete mode 100644 packages/test/amplify_integration_test/lib/src/integration_test_utils/auth_cognito/types/delete_user_response.dart diff --git a/packages/test/amplify_auth_integration_test/analysis_options.yaml b/packages/test/amplify_auth_integration_test/analysis_options.yaml index 7f605f74d4..e2a8bcd31e 100644 --- a/packages/test/amplify_auth_integration_test/analysis_options.yaml +++ b/packages/test/amplify_auth_integration_test/analysis_options.yaml @@ -1 +1,5 @@ include: package:amplify_lints/library.yaml + +analyzer: + errors: + public_member_api_docs: ignore diff --git a/packages/test/amplify_integration_test/analysis_options.yaml b/packages/test/amplify_integration_test/analysis_options.yaml index 01cc51f70b..6711dbc0e4 100644 --- a/packages/test/amplify_integration_test/analysis_options.yaml +++ b/packages/test/amplify_integration_test/analysis_options.yaml @@ -1,5 +1,7 @@ include: package:amplify_lints/library.yaml analyzer: + errors: + public_member_api_docs: ignore exclude: - lib/src/sdk diff --git a/packages/test/amplify_integration_test/lib/amplify_integration_test.dart b/packages/test/amplify_integration_test/lib/amplify_integration_test.dart index 9e000ad0b8..7f18d2bd35 100644 --- a/packages/test/amplify_integration_test/lib/amplify_integration_test.dart +++ b/packages/test/amplify_integration_test/lib/amplify_integration_test.dart @@ -20,7 +20,6 @@ export 'package:amplify_test/amplify_test.dart'; /// Auth Utils export 'src/integration_test_utils/auth_cognito/integration_test_auth_utils.dart'; export 'src/integration_test_utils/auth_cognito/types/create_mfa_code_response.dart'; -export 'src/integration_test_utils/auth_cognito/types/delete_user_response.dart'; /// Stubs export 'src/stubs/amplify_auth_cognito_stub.dart'; diff --git a/packages/test/amplify_integration_test/lib/src/integration_test_utils/auth_cognito/types/delete_user_response.dart b/packages/test/amplify_integration_test/lib/src/integration_test_utils/auth_cognito/types/delete_user_response.dart deleted file mode 100644 index 5c6cf73947..0000000000 --- a/packages/test/amplify_integration_test/lib/src/integration_test_utils/auth_cognito/types/delete_user_response.dart +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -import 'dart:convert'; - -class DeleteUserResponse { - late bool success; - String? error; - DeleteUserResponse.fromJson(String resolverData) { - Map parsedMap = (jsonDecode(resolverData) as Map).cast(); - success = parsedMap['deleteUser']['success'] as bool; - error = parsedMap['deleteUser']['error'] as String?; - } -} diff --git a/packages/test/amplify_integration_test/lib/src/stubs/amplify_auth_cognito_stub.dart b/packages/test/amplify_integration_test/lib/src/stubs/amplify_auth_cognito_stub.dart index 3a727ca258..a6e919cd47 100644 --- a/packages/test/amplify_integration_test/lib/src/stubs/amplify_auth_cognito_stub.dart +++ b/packages/test/amplify_integration_test/lib/src/stubs/amplify_auth_cognito_stub.dart @@ -21,7 +21,7 @@ const codeMismatchException = CodeMismatchException( 'Incorrect code. Please try again.', ); -/// A stub of [AmplifyAuthCognito] that creates users in memory. +/// A stub of `AmplifyAuthCognito` that creates users in memory. class AmplifyAuthCognitoStub extends AuthPluginInterface implements AmplifyPluginInterface { AmplifyAuthCognitoStub({ @@ -67,11 +67,11 @@ class AmplifyAuthCognitoStub extends AuthPluginInterface SignUpOptions? options, }) async { await Future.delayed(delay); - var user = _users[username]; + final user = _users[username]; if (user != null) { throw usernameExistsException; } else { - var newUser = MockCognitoUser( + final newUser = MockCognitoUser( username: username, password: password, email: options?.userAttributes['email'], @@ -111,7 +111,7 @@ class AmplifyAuthCognitoStub extends AuthPluginInterface ResendSignUpCodeOptions? options, }) async { await Future.delayed(delay); - var user = _users[username]; + final user = _users[username]; if (user == null) { throw userNotFoundException; } @@ -125,7 +125,7 @@ class AmplifyAuthCognitoStub extends AuthPluginInterface SignInOptions? options, }) async { await Future.delayed(delay); - var user = _users[username]; + final user = _users[username]; if (user == null) { throw userNotFoundException; } @@ -174,7 +174,7 @@ class AmplifyAuthCognitoStub extends AuthPluginInterface ResetPasswordOptions? options, }) async { await Future.delayed(delay); - var user = _users[username]; + final user = _users[username]; if (user == null) { throw userNotFoundException; } @@ -195,14 +195,14 @@ class AmplifyAuthCognitoStub extends AuthPluginInterface ConfirmResetPasswordOptions? options, }) async { await Future.delayed(delay); - var user = _users[username]; + final user = _users[username]; if (user == null) { throw userNotFoundException; } if (confirmationCode != verificationCode) { throw codeMismatchException; } - var updatedUser = user.copyWith(password: newPassword); + final updatedUser = user.copyWith(password: newPassword); _users[username] = updatedUser; _currentUser = updatedUser; return const CognitoResetPasswordResult( @@ -391,14 +391,6 @@ class AmplifyAuthCognitoStub extends AuthPluginInterface } class MockCognitoUser { - const MockCognitoUser._({ - required this.sub, - required this.username, - required this.password, - required this.phoneNumber, - required this.email, - }); - factory MockCognitoUser({ required String username, required String password, @@ -413,6 +405,13 @@ class MockCognitoUser { phoneNumber: phoneNumber, ); } + const MockCognitoUser._({ + required this.sub, + required this.username, + required this.password, + required this.phoneNumber, + required this.email, + }); final String sub; final String username; final String password; From 98470ff047bd67c9c5fec4445a1dfe12c641216a Mon Sep 17 00:00:00 2001 From: Dillon Nys Date: Mon, 18 Sep 2023 11:59:59 -0700 Subject: [PATCH 6/7] chore(tool): Fix analysis error --- tool/send_metric_data.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/send_metric_data.dart b/tool/send_metric_data.dart index a74c81887a..a9049e1426 100755 --- a/tool/send_metric_data.dart +++ b/tool/send_metric_data.dart @@ -43,7 +43,7 @@ void main(List args) { value, ]; - if (!dimensionsTrimmed.isEmpty) { + if (dimensionsTrimmed.isNotEmpty) { cloudArgs.add('--dimensions'); cloudArgs.add(dimensionsTrimmed); } From 5e2e7c8cc6e6f16f36a2f5439984d5b8c2927b13 Mon Sep 17 00:00:00 2001 From: Dillon Nys Date: Mon, 18 Sep 2023 12:21:03 -0700 Subject: [PATCH 7/7] test(authenticator): Unskip passing test --- .../sign_in_with_username_test.dart | 109 ++++++++---------- 1 file changed, 50 insertions(+), 59 deletions(-) diff --git a/packages/authenticator/amplify_authenticator/example/integration_test/sign_in_with_username_test.dart b/packages/authenticator/amplify_authenticator/example/integration_test/sign_in_with_username_test.dart index aeea1e67e3..9bd3ee5577 100644 --- a/packages/authenticator/amplify_authenticator/example/integration_test/sign_in_with_username_test.dart +++ b/packages/authenticator/amplify_authenticator/example/integration_test/sign_in_with_username_test.dart @@ -1,13 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// This test follows the Amplify UI feature "sign-in-with-username" -// https://github.com/aws-amplify/amplify-ui/blob/main/packages/e2e/features/ui/components/authenticator/sign-up-with-username.feature - -import 'dart:io'; - import 'package:amplify_authenticator_test/amplify_authenticator_test.dart'; -import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_integration_test/amplify_integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -177,58 +171,55 @@ void main() { }); testWidgets( - 'Sign in with confirmed credentials after a failed attempt with bad credentials', - (tester) async { - final username = generateUsername(); - final password = generatePassword(); - await adminCreateUser( - username, - password, - autoConfirm: true, - verifyAttributes: true, - ); - - await loadAuthenticator(tester: tester); - final signInPage = SignInPage(tester: tester); - signInPage.expectUsername(); - - expect( - tester.bloc.stream, - emitsInOrder([ - UnauthenticatedState.signIn, - isA(), - emitsDone, - ]), - ); - - // When I type my "username" - await signInPage.enterUsername('bad_username'); - - // And I type my bad password - await signInPage.enterPassword(password); - - // And I click the "Sign in" button - await signInPage.submitSignIn(); - - /// Then I see UserNotFound exception banner - signInPage.expectUserNotFound(); - - // Then I type the correct username - await signInPage.enterUsername(username); - - // Then I type the correct password - await signInPage.enterPassword(password); - - // And I click the "Sign in" button - await signInPage.submitSignIn(); - - // Then I am signed in - await signInPage.expectAuthenticated(); - - await tester.bloc.close(); - }, - // TODO(dnys1): Multiple `enterText` calls is failing on Android - skip: !zIsWeb && Platform.isAndroid, - ); + 'Sign in with confirmed credentials after a failed attempt with bad credentials', + (tester) async { + final username = generateUsername(); + final password = generatePassword(); + await adminCreateUser( + username, + password, + autoConfirm: true, + verifyAttributes: true, + ); + + await loadAuthenticator(tester: tester); + final signInPage = SignInPage(tester: tester); + signInPage.expectUsername(); + + expect( + tester.bloc.stream, + emitsInOrder([ + UnauthenticatedState.signIn, + isA(), + emitsDone, + ]), + ); + + // When I type my "username" + await signInPage.enterUsername('bad_username'); + + // And I type my bad password + await signInPage.enterPassword(password); + + // And I click the "Sign in" button + await signInPage.submitSignIn(); + + /// Then I see UserNotFound exception banner + signInPage.expectUserNotFound(); + + // Then I type the correct username + await signInPage.enterUsername(username); + + // Then I type the correct password + await signInPage.enterPassword(password); + + // And I click the "Sign in" button + await signInPage.submitSignIn(); + + // Then I am signed in + await signInPage.expectAuthenticated(); + + await tester.bloc.close(); + }); }); }