Skip to content

Chore/release2.6.3 #6163

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

Merged
merged 4 commits into from
Jun 17, 2025
Merged
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
13 changes: 8 additions & 5 deletions actions/lib/src/node/actions/exec.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

import 'dart:convert';
import 'dart:js_interop';
//ignore: deprecated_member_use
import 'dart:js_util';

@JS()
external Exec get exec;
Expand Down Expand Up @@ -46,9 +44,14 @@ extension type Exec._(JSObject it) {
ignoreReturnCode: !failOnNonZeroExit,
);
try {
final exitCode = await promiseToFuture<int>(
_exec(commandLine, args.map((arg) => arg.toJS).toList().toJS, options),
);
final jsExitCode =
await _exec(
commandLine,
args.map((arg) => arg.toJS).toList().toJS,
options,
).toDart;

final exitCode = (jsExitCode as JSNumber).toDartInt;
return ExecResult(
exitCode: exitCode,
stdout: stdout.toString(),
Expand Down
8 changes: 7 additions & 1 deletion actions/lib/src/node/actions/http_request.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

import 'dart:js_interop';

import 'package:web/web.dart';

@JS()
extension type HttpClient._(JSObject it) {
external HttpClient([
Expand All @@ -18,7 +20,11 @@ extension type HttpClient._(JSObject it) {
String requestUrl, {
Map<String, String> headers = const {},
}) async {
final jsHeaders = headers.jsify() as JSObject;
final jsHeaders = Headers();
for(final entry in headers.entries) {
jsHeaders.append(entry.key, entry.value);
}

final response = await _getJson(requestUrl, jsHeaders).toDart;
final result = response as TypedResponse<JSObject>;
if (result.statusCode != 200) {
Expand Down
1 change: 1 addition & 0 deletions actions/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ dependencies:
source_maps: ^0.10.12
stack_trace: ^1.10.0
stream_transform: ^2.1.0
web: ^1.1.1

dev_dependencies:
amplify_lints: ^3.0.0
Expand Down
4 changes: 2 additions & 2 deletions packages/aft/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
async: ^2.10.0
aws_common: ">=0.4.2+5 <0.5.0"
built_collection: ^5.0.0
built_value: '8.10.0'
built_value: ^8.10.1
checked_yaml: ^2.0.0
cli_util: ^0.3.5
code_builder: ^4.10.1
Expand Down Expand Up @@ -66,7 +66,7 @@ dependency_overrides:
dev_dependencies:
amplify_lints: ^3.1.0
build_runner: ^2.4.9
built_value_generator: '8.10.0'
built_value_generator: ^8.10.1
checks: ^0.3.0
json_serializable: ^6.9.4
test: ^1.22.1
Expand Down
2 changes: 1 addition & 1 deletion packages/aft/test/config/config_loader_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ environment:
sdk: ^3.7.0

dependencies:
built_value: ^8.0.0
built_value: ^8.10.1
json_serializable: ^6.9.4

aft:
Expand Down
4 changes: 4 additions & 0 deletions packages/amplify/amplify_flutter/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.6.3

- Minor bug fixes and improvements

## 2.6.2

### Fixes
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/amplify/amplify_flutter/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: amplify_flutter
description: The top level Flutter package for the AWS Amplify libraries.
version: 2.6.2
version: 2.6.3
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
Expand All @@ -20,7 +20,7 @@ platforms:

dependencies:
amplify_core: ">=2.6.2 <2.7.0"
amplify_secure_storage: ">=0.5.9 <0.6.0"
amplify_secure_storage: ">=0.5.10 <0.6.0"
aws_common: ">=0.7.7 <0.8.0"
collection: ^1.15.0
flutter:
Expand Down
4 changes: 4 additions & 0 deletions packages/amplify_core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.6.3

- Minor bug fixes and improvements

## 2.6.2

### Chores
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify_core/lib/src/platform/platform.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

export 'platform_stub.dart'
if (dart.library.io) 'platform_io.dart'
if (dart.library.html) 'platform_html.dart';
if (dart.library.js_interop) 'platform_html.dart';
3 changes: 1 addition & 2 deletions packages/amplify_core/lib/src/platform/platform_html.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

//ignore: deprecated_member_use
import 'dart:html';
import 'package:web/web.dart';

final RegExp _edgeRegex = RegExp(r'Edg/[\d\.]+');
final RegExp _operaRegex = RegExp(r'OPR/[\d\.]+');
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify_core/lib/src/version.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions packages/amplify_core/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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.6.2
version: 2.6.3
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
Expand All @@ -10,8 +10,8 @@ environment:

dependencies:
async: ^2.10.0
aws_common: ">=0.7.7 <0.8.0"
aws_signature_v4: ">=0.6.5 <0.7.0"
aws_common: ">=0.7.8 <0.8.0"
aws_signature_v4: ">=0.6.6 <0.7.0"
collection: ^1.15.0
graphs: ^2.1.0
intl: ">=0.18.0 <1.0.0"
Expand All @@ -21,6 +21,7 @@ dependencies:
retry: ^3.1.0
stack_trace: ^1.10.0
uuid: ">=3.0.6 <5.0.0"
web: ^1.1.1

dev_dependencies:
amplify_lints: ">=3.1.2 <3.2.0"
Expand Down
4 changes: 4 additions & 0 deletions packages/amplify_datastore/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.6.3

- Minor bug fixes and improvements

## 2.6.2

### Chores
Expand Down
4 changes: 4 additions & 0 deletions packages/amplify_datastore/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ android {
htmlReport false
}
compileOptions {
coreLibraryDesugaringEnabled true

sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
Expand All @@ -73,6 +75,8 @@ android {
}

dependencies {
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.2.0"

implementation 'com.amplifyframework:aws-auth-cognito:2.21.1'
implementation "com.amplifyframework:aws-api:2.21.1"
implementation "com.amplifyframework:aws-datastore:2.21.1"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/amplify_datastore/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: amplify_datastore
description: The Amplify Flutter DataStore category plugin, providing a queryable, on-device data store.
version: 2.6.2
version: 2.6.3
homepage: https://docs.amplify.aws/lib/q/platform/flutter/
repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/amplify_datastore
issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions packages/analytics/amplify_analytics_pinpoint/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.6.3

- Minor bug fixes and improvements

## 2.6.2

### Chores
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dev_dependencies:
path: ../../../amplify_lints
aws_common: ">=0.4.0 <0.5.0"
build_runner: ^2.4.9
built_value: '8.10.0'
built_value: ^8.10.1
flutter_test:
sdk: flutter
integration_test:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
// SPDX-License-Identifier: Apache-2.0

export 'device_info_provider_stub.dart'
if (dart.library.html) 'device_info_provider_html.dart'
if (dart.library.js_interop) 'device_info_provider_html.dart'
if (dart.library.io) 'device_info_provider_io.dart';
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
// SPDX-License-Identifier: Apache-2.0

export 'flutter_path_provider_stub.dart'
if (dart.library.html) 'flutter_path_provider_html.dart'
if (dart.library.js_interop) 'flutter_path_provider_html.dart'
if (dart.library.io) 'flutter_path_provider_io.dart';
12 changes: 6 additions & 6 deletions packages/analytics/amplify_analytics_pinpoint/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: amplify_analytics_pinpoint
description: The Amplify Flutter Analytics category plugin using the AWS Pinpoint provider.
version: 2.6.2
version: 2.6.3
homepage: https://docs.amplify.aws/lib/q/platform/flutter/
repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/analytics/amplify_analytics_pinpoint
issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues
Expand All @@ -19,11 +19,11 @@ platforms:
web:

dependencies:
amplify_analytics_pinpoint_dart: ">=0.4.9 <0.5.0"
amplify_core: ">=2.6.2 <2.7.0"
amplify_db_common: ">=0.4.10 <0.5.0"
amplify_secure_storage: ">=0.5.9 <0.6.0"
aws_common: ">=0.7.7 <0.8.0"
amplify_analytics_pinpoint_dart: ">=0.4.10 <0.5.0"
amplify_core: ">=2.6.3 <2.7.0"
amplify_db_common: ">=0.4.11 <0.5.0"
amplify_secure_storage: ">=0.5.10 <0.6.0"
aws_common: ">=0.7.8 <0.8.0"
device_info_plus: ^11.3.3

flutter:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.4.10

- Minor bug fixes and improvements

## 0.4.9

### Chores
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
// SPDX-License-Identifier: Apache-2.0

export 'dart_queued_item_store.stub.dart'
if (dart.library.html) 'dart_queued_item_store.web.dart'
if (dart.library.js_interop) 'dart_queued_item_store.web.dart'
if (dart.library.io) 'dart_queued_item_store.vm.dart';
Loading
Loading