Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(repo): Bump Dart SDK to 3.0.6 #3676

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/BUG-REPORT.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,15 @@ 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
id: amplify-version
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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/amplify_canaries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dart_dart2js.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
matrix:
sdk:
# Minimum supported Dart version
- "3.0.1"
- "3.0.6"
- stable
- beta
browser:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dart_ddc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
matrix:
sdk:
# Minimum supported Dart version
- "3.0.1"
- "3.0.6"
- stable
- beta
browser:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dart_vm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
matrix:
sdk:
# Minimum supported Dart version
- "3.0.1"
- "3.0.6"
- stable
- beta
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flutter_vm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions canaries/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: infra
publish_to: none

environment:
sdk: ^3.0.0
sdk: ^3.0.6

dependencies:
amplify_core: any
Expand Down
2 changes: 1 addition & 1 deletion packages/aft/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify/amplify_flutter/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify/amplify_flutter/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify_core/doc/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify_core/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify_datastore/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify_datastore/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify_datastore_plugin_interface/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify_lints/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify_native_legacy_wrapper/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify_native_legacy_wrapper/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions packages/analytics/amplify_analytics_pinpoint/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions packages/api/amplify_api/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions packages/api/amplify_api/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
},
Expand Down Expand Up @@ -405,10 +405,7 @@ class WebSocketBloc with AWSDebuggable, AmplifyLoggerMixin {
}

currentState.service
.register(
currentState,
request,
)
.register(currentState, request)
.onError<Object>(subscriptionBloc.addResponseError);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/api/amplify_api_dart/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 8 additions & 6 deletions packages/api/amplify_api_dart/test/util.dart
Original file line number Diff line number Diff line change
Expand Up @@ -256,15 +256,17 @@ class MockWebSocketService extends AmplifyWebSocketService {

@override
Stream<WebSocketEvent> 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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<ConnectivityStatus>();
final bloc = WebSocketBloc(
config: testApiKeyConfig,
authProviderRepo: getTestAuthProviderRepo(),
wsService: badService,
subscriptionOptions: subscriptionOptions,
pollClientOverride: mockPollClient.client,
connectivity: const MockConnectivity(),
);

expect(
bloc.stream,
emitsInOrder(
[
isA<DisconnectedState>(),
isA<ConnectingState>(),
isA<FailureState>(),
isA<PendingDisconnect>(),
isA<DisconnectedState>(),
],
),
);
test('triggering FailureState on Exception during init', () async {
final badService = MockWebSocketService(badInit: true);
mockNetworkStreamController = StreamController<ConnectivityStatus>();
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<DisconnectedState>(),
isA<ConnectingState>(),
isA<FailureState>(),
isA<PendingDisconnect>(),
isA<DisconnectedState>(),
],
),
);
});

test('Exception from service and should return error to user', () async {
final subscribeEvent = SubscribeEvent(
Expand Down
Loading
Loading