Skip to content

Commit 24edb24

Browse files
author
Dillon Nys
committed
Merge remote-tracking branch 'aws/next' into feat/next-release
2 parents a494b43 + 1e975a7 commit 24edb24

File tree

44 files changed

+228
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+228
-78
lines changed

packages/aft/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ environment:
99
dependencies:
1010
args: ^2.3.0
1111
async: ^2.9.0
12-
aws_common: ">=0.2.3 <0.3.0"
12+
aws_common: ">=0.3.0 <0.4.0"
1313
checked_yaml: ^2.0.0
1414
cli_util: ^0.3.5
1515
collection: ^1.16.0
@@ -30,8 +30,8 @@ dependencies:
3030
ref: 0a48753420cbd03eb72a92d38ef06fe3164dc335
3131
pub_semver: ^2.1.1
3232
pubspec_parse: ^1.2.0
33-
smithy: ">=0.1.1 <0.2.0"
34-
smithy_codegen: ">=0.1.1 <0.2.0"
33+
smithy: ">=0.3.0 <0.4.0"
34+
smithy_codegen: ">=0.3.0 <0.4.0"
3535
stream_transform: ^2.0.0
3636
yaml: ^3.1.0
3737
yaml_edit: ^2.0.3

packages/amplify/amplify_flutter/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## 1.0.0-next.0+5
2+
3+
### Features
4+
- feat(auth): SignInDetails
5+
6+
### Fixes
7+
- fix(auth): Support Cognito proxies
8+
- fix(authenticator): Configuration error handling
9+
- fix(authenticator): remove unnecessary assertion in PendingVerificationCheckState constructor ([#2325](https://github.com/aws-amplify/amplify-flutter/pull/2325))
10+
111
## 1.0.0-next.0+4
212

313
- Minor bug fixes and improvements

packages/amplify/amplify_flutter/pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: amplify_flutter
22
description: The top level Flutter package for the AWS Amplify libraries.
3-
version: 1.0.0-next.0+4
3+
version: 1.0.0-next.0+5
44
homepage: https://docs.amplify.aws/lib/q/platform/flutter/
55
repository: https://github.com/aws-amplify/amplify-flutter/tree/next/packages/amplify/amplify_flutter
66
issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues
@@ -19,12 +19,12 @@ platforms:
1919
web:
2020

2121
dependencies:
22-
amplify_core: ">=1.0.0-next.0+2 <1.0.0-next.1"
22+
amplify_core: ">=1.0.0-next.0+3 <1.0.0-next.1"
2323
amplify_datastore_plugin_interface: ">=1.0.0-next.0+2 <1.0.0-next.1"
2424
amplify_flutter_android: ">=1.0.0-next.0 <1.0.0-next.1"
2525
amplify_flutter_ios: ">=1.0.0-next.0+2 <1.0.0-next.1"
26-
amplify_secure_storage: ">=0.1.2 <0.2.0"
27-
aws_common: ">=0.2.4 <0.3.0"
26+
amplify_secure_storage: ">=0.1.3 <0.2.0"
27+
aws_common: ">=0.3.0 <0.4.0"
2828
collection: ^1.15.0
2929
flutter:
3030
sdk: flutter

packages/amplify_authenticator/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 1.0.0-next.0+5
2+
3+
### Fixes
4+
- fix(authenticator): Configuration error handling
5+
- fix(authenticator): remove unnecessary assertion in PendingVerificationCheckState constructor ([#2325](https://github.com/aws-amplify/amplify-flutter/pull/2325))
6+
17
## 1.0.0-next.0+4
28

39
- Minor bug fixes and improvements

packages/amplify_authenticator/lib/amplify_authenticator.dart

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -759,21 +759,20 @@ class _AuthenticatorBody extends StatelessWidget {
759759
return _AuthStateBuilder(
760760
child: child,
761761
builder: (state, child) {
762+
if (state is AuthenticatedState) return child;
762763
return Navigator(
763764
onPopPage: (_, dynamic __) => true,
764765
pages: [
765-
if (state is AuthenticatedState) MaterialPage<void>(child: child),
766-
if (state is! AuthenticatedState)
767-
MaterialPage<void>(
768-
child: ScaffoldMessenger(
769-
key: _AuthenticatorState.scaffoldMessengerKey,
770-
child: Scaffold(
771-
body: SizedBox.expand(
772-
child: child,
773-
),
766+
MaterialPage<void>(
767+
child: ScaffoldMessenger(
768+
key: _AuthenticatorState.scaffoldMessengerKey,
769+
child: Scaffold(
770+
body: SizedBox.expand(
771+
child: child,
774772
),
775773
),
776774
),
775+
),
777776
],
778777
);
779778
},

packages/amplify_authenticator/pubspec.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: amplify_authenticator
22
description: A prebuilt Sign In and Sign Up experience for the Amplify Auth category
3-
version: 1.0.0-next.0+4
3+
version: 1.0.0-next.0+5
44
homepage: https://ui.docs.amplify.aws/flutter/connected-components/authenticator
55
repository: https://github.com/aws-amplify/amplify-flutter/tree/next/packages/amplify_authenticator
66
issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues
@@ -10,19 +10,19 @@ environment:
1010
flutter: ">=3.0.0"
1111

1212
dependencies:
13-
amplify_auth_cognito: ">=1.0.0-next.0+6 <1.0.0-next.2"
14-
amplify_core: ">=1.0.0-next.0+2 <1.0.0-next.1"
15-
amplify_flutter: ">=1.0.0-next.0+4 <1.0.0-next.1"
13+
amplify_auth_cognito: ">=1.0.0-next.0+7 <1.0.0-next.2"
14+
amplify_core: ">=1.0.0-next.0+3 <1.0.0-next.1"
15+
amplify_flutter: ">=1.0.0-next.0+5 <1.0.0-next.1"
1616
async: ^2.8.0
17-
aws_common: ">=0.2.4 <0.3.0"
17+
aws_common: ">=0.3.0 <0.4.0"
1818
collection: ^1.15.0
1919
flutter:
2020
sdk: flutter
2121
flutter_localizations:
2222
sdk: flutter
2323
intl: ^0.17.0
2424
meta: ^1.7.0
25-
smithy: ">=0.2.0 <0.3.0"
25+
smithy: ">=0.3.0 <0.4.0"
2626
stream_transform: ^2.0.0
2727

2828
dev_dependencies:

packages/amplify_core/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 1.0.0-next.0+3
2+
3+
### Features
4+
- feat(core): AWS config file
5+
16
## 1.0.0-next.0+2
27

38
### Features

packages/amplify_core/lib/src/amplify_class.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ abstract class AmplifyClass {
145145
static AmplifyClass? instance;
146146

147147
/// The library version.
148-
String get version => '1.0.0-next.0';
148+
String get version => '1.0.0-next.0+3';
149149

150150
/// Resets the Amplify implementation, removing all traces of Amplify from
151151
/// the device.

packages/amplify_core/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: amplify_core
22
description: The base package containing common types and utilities that are shared across the Amplify Flutter packages.
3-
version: 1.0.0-next.0+2
3+
version: 1.0.0-next.0+3
44
homepage: https://docs.amplify.aws/lib/q/platform/flutter/
55
repository: https://github.com/aws-amplify/amplify-flutter/tree/next/packages/amplify_core
66
issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues
@@ -10,8 +10,8 @@ environment:
1010

1111
dependencies:
1212
async: ^2.8.2
13-
aws_common: ">=0.2.4 <0.3.0"
14-
aws_signature_v4: ">=0.2.2 <0.3.0"
13+
aws_common: ">=0.3.0 <0.4.0"
14+
aws_signature_v4: ">=0.3.0 <0.4.0"
1515
collection: ^1.15.0
1616
intl: ^0.17.0
1717
json_annotation: ^4.6.0

packages/amplify_datastore/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.0.0-next.0+4
2+
3+
- Minor bug fixes and improvements
4+
15
## 1.0.0-next.0+3
26

37
- Minor bug fixes and improvements

0 commit comments

Comments
 (0)