Merge remote-tracking branch 'origin/main' into multi-bucket

merging changes from main that unblock some tests

Author: ekjotmultani

infra-gen2/package-lock.json

@@ -1,3 +1,12 @@
+## 2.4.1
+
+### Fixes
+- fix(datastore): FlutterSerializedModel.extractJsonValue returns `.some(nil)` instead of `nil` ([#5370](https://github.com/aws-amplify/amplify-flutter/pull/5370))
+- fix(api): web socket error handling ([#5359](https://github.com/aws-amplify/amplify-flutter/pull/5359))
+
+### Chores
+- chore(deps): Amplify Android 2.21.1 ([#5376](https://github.com/aws-amplify/amplify-flutter/pull/5376))
+
 ## 2.4.0
 
 ### Features

packages/aft/test/version_bump/data/repo_snapshot/packages/aws_common/pubspec.yaml

@@ -1,6 +1,6 @@
 name: amplify_flutter
 description: The top level Flutter package for the AWS Amplify libraries.
-version: 2.4.0
+version: 2.4.1
 homepage: https://docs.amplify.aws/lib/q/platform/flutter/
 repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/amplify/amplify_flutter
 issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues
@@ -19,9 +19,9 @@ platforms:
   web:
 
 dependencies:
-  amplify_core: ">=2.4.0 <2.5.0"
-  amplify_secure_storage: ">=0.5.5 <0.6.0"
-  aws_common: ">=0.7.2 <0.8.0"
+  amplify_core: ">=2.4.1 <2.5.0"
+  amplify_secure_storage: ">=0.5.7 <0.6.0"
+  aws_common: ">=0.7.3 <0.8.0"
   collection: ^1.15.0
   flutter:
     sdk: flutter

packages/aft/test/version_bump/data/repo_snapshot/packages/notifications/push/amplify_push_notifications/pubspec.yaml

@@ -1,3 +1,8 @@
+## 2.4.1
+
+### Fixes
+- fix(api): web socket error handling ([#5359](https://github.com/aws-amplify/amplify-flutter/pull/5359))
+
 ## 2.4.0
 
 ### Features

packages/amplify/amplify_flutter/CHANGELOG.md

@@ -1,6 +1,6 @@
 name: amplify_core
 description: The base package containing common types and utilities that are shared across the Amplify Flutter packages.
-version: 2.4.0
+version: 2.4.1
 homepage: https://docs.amplify.aws/lib/q/platform/flutter/
 repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/amplify_core
 issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues
@@ -10,8 +10,8 @@ environment:
 
 dependencies:
   async: ^2.10.0
-  aws_common: ">=0.7.2 <0.8.0"
-  aws_signature_v4: ">=0.6.2 <0.7.0"
+  aws_common: ">=0.7.3 <0.8.0"
+  aws_signature_v4: ">=0.6.3 <0.7.0"
   collection: ^1.15.0
   graphs: ^2.1.0
   intl: ">=0.18.0 <1.0.0"

packages/amplify/amplify_flutter/pubspec.yaml

@@ -1,3 +1,8 @@
+## 2.4.1
+
+### Fixes
+- fix(datastore): FlutterSerializedModel.extractJsonValue returns `.some(nil)` instead of `nil` ([#5370](https://github.com/aws-amplify/amplify-flutter/pull/5370))
+
 ## 2.4.0
 
 ### Fixes