chore(version): dev-preview release (#2605)

* chore(repo): Update component definition Adds `amplify_api_dart` to the mix and creates components for DB Common, Secure Storage, and AWS Common * fix(aft): Update changelog logic For the version commit message changelog, only include publishable packages. Also updates base ref logic to ensure packages can be moved in and out of components. * chore(version): Bump version - fix(auth)!: Fetch Auth Session offline behavior ([#2585](#2585)) - fix(api): do not include null values in ModelMutations.create ([#2504](#2504)) - fix(api): model helpers use targetNames in schemas with CPK enabled ([#2559](#2559)) - fix(auth): Clear credentials before redirect on Web ([#2603](#2603)) - fix(auth): Refresh token in non-state machine calls ([#2572](#2572)) - fix(authenticator): ARB syntax ([#2560](#2560)) - fix(aws_common): AWSFile contentType getter should not throw exception - fix(datastore): prevent unhandled exception crashing App rebuilding sync expression - fix(storage): incorrect transferred bytes emitted from upload task - feat(analytics): Legacy data migration of Pinpoint Endpoint ID ([#2489](#2489)) - feat(smithy_aws): add copyWith to S3ClientConfig - feat(storage): allow configuring transfer acceleration Updated-Components: Amplify Flutter, Amplify Dart, Amplify UI, DB Common, Secure Storage, AWS Common, Smithy, Worker Bee --------- Co-authored-by: Dillon Nys <nydillon@amazon.com>
aws-amplify · Jan 30, 2023 · 20d2215 · 20d2215
1 parent f49134a
commit 20d2215
Show file tree

Hide file tree

Showing 101 changed files with 439 additions and 391 deletions.
diff --git a/aft.yaml b/aft.yaml
@@ -49,12 +49,29 @@ components:
     summary: amplify_core
     propagate: none
     packages:
-    - amplify_auth_cognito_dart
     - amplify_analytics_pinpoint_dart
+    - amplify_api_dart
+    - amplify_auth_cognito_dart
     - amplify_storage_s3_dart
   - name: Amplify UI
     packages:
     - amplify_authenticator
+  - name: DB Common
+    summary: amplify_db_common
+    packages:
+    - amplify_db_common
+    - amplify_db_common_dart
+  - name: Secure Storage
+    summary: amplify_secure_storage
+    packages:
+    - amplify_secure_storage
+    - amplify_secure_storage_dart
+  - name: AWS Common
+    summary: aws_common
+    propagate: none
+    packages:
+    - aws_common
+    - aws_signature_v4
   - name: Smithy
     summary: smithy
     packages:

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -7,10 +7,10 @@ environment:
   flutter: ">=3.0.0"
 
 dependencies:
-  amplify_flutter: ^1.0.0-0
-  amplify_analytics_pinpoint: ^1.0.0-0
-  amplify_auth_cognito: ^1.0.0-0
-  amplify_storage_s3: ^1.0.0-0
+  amplify_flutter: ">=1.0.0-next.4 <1.0.0-next.5"
+  amplify_analytics_pinpoint: ">=1.0.0-next.4 <1.0.0-next.5"
+  amplify_auth_cognito: ">=1.0.0-next.4 <1.0.0-next.5"
+  amplify_storage_s3: ">=1.0.0-next.4 <1.0.0-next.5"
   file_picker: ^5.0.0
   flutter:
     sdk: flutter

diff --git a/infra/pubspec.yaml b/infra/pubspec.yaml
@@ -5,6 +5,5 @@ environment:
   sdk: ">=2.18.0 <3.0.0"
 
 dependencies:
-  amplify_core:
-    path: ../packages/amplify_core
+  amplify_core: ">=1.0.0-next.4 <1.0.0-next.5"
   path: any
diff --git a/packages/aft/lib/src/commands/version_bump_command.dart b/packages/aft/lib/src/commands/version_bump_command.dart
@@ -55,7 +55,7 @@ class VersionBumpCommand extends AmplifyCommand
   late final bool preview = argResults!['preview'] as bool;
 
   GitChanges _changesForPackage(PackageInfo package) {
-    final baseRef = this.baseRef ?? repo.latestBumpRef(package.name);
+    final baseRef = this.baseRef ?? repo.latestBumpRef(package);
     if (baseRef == null) {
       exitError(
         'No previous version bumps for package (${package.name}). '
@@ -131,13 +131,17 @@ class VersionBumpCommand extends AmplifyCommand
 
     logger.info('Version successfully bumped');
     // Stage changes
+    final publishableBumpedPackages =
+        bumpedPackages.where((pkg) => pkg.isPublishable).toList();
     final mergedChangelog = Changelog.empty().makeVersionEntry(
       commits: {
-        for (final package in bumpedPackages)
+        for (final package in publishableBumpedPackages)
           ...?repo.changelogUpdates[package]?.commits,
       },
     );
-    final updatedComponents = List.of(bumpedPackages.map((pkg) => pkg.name));
+    final updatedComponents = List.of(
+      publishableBumpedPackages.map((pkg) => pkg.name),
+    );
     for (final component in repo.components.values) {
       final componentPackages =
           component.packages.map((pkg) => pkg.name).toList();

diff --git a/packages/aft/lib/src/repo.dart b/packages/aft/lib/src/repo.dart
@@ -86,22 +86,23 @@ class Repo {
   /// The libgit repository.
   late final Repository repo = Repository.open(rootDir.path);
 
-  /// Returns the latest version bump commit for [packageOrComponent], or `null`
-  /// if no such commit exists.
+  /// Returns the latest version bump commit for [package], or `null` if no such
+  /// commit exists.
   ///
-  /// This is the marker of the last time [packageOrComponent] was released and
-  /// is used as the base git reference for calculating changes relevant to this
-  /// version bump.
-  String? latestBumpRef(String packageOrComponent) {
-    final component = components[packageOrComponent]?.name ??
+  /// This is the marker of the last time [package] was released and is used as
+  /// the base git reference for calculating changes relevant to this version
+  /// bump.
+  String? latestBumpRef(PackageInfo package) {
+    final packageName = package.name;
+    final component = components[packageName]?.name ??
         components.values
             .firstWhereOrNull(
               (component) => component.packages
                   .map((pkg) => pkg.name)
-                  .contains(packageOrComponent),
+                  .contains(packageName),
             )
             ?.name ??
-        packageOrComponent;
+        packageName;
     var commit = Commit.lookup(repo: repo, oid: repo.head.target);
     while (commit.parents.isNotEmpty) {
       final commitMessage = CommitMessage.parse(
@@ -111,7 +112,10 @@ class Repo {
         commitTimeSecs: commit.time,
       );
       if (commitMessage is VersionCommitMessage &&
+          // Check both the component and the package since the definition of
+          // components can change over time.
           (commitMessage.updatedComponents.contains(component) ||
+              commitMessage.updatedComponents.contains(packageName) ||
               commitMessage.updatedComponents.isEmpty)) {
         return commitMessage.sha;
       }

diff --git a/packages/aft/pubspec.yaml b/packages/aft/pubspec.yaml
@@ -9,8 +9,7 @@ environment:
 dependencies: 
   args: ^2.3.0
   async: ^2.8.0
-  aws_common:
-    path: ../aws_common
+  aws_common: ">=0.4.0 <0.5.0"
   built_collection: ^5.0.0
   built_value: ">=8.4.0 <8.5.0"
   checked_yaml: ^2.0.0
@@ -37,8 +36,7 @@ dependencies:
       ref: 6cbbec2abbf6a54074ae1005c06a26dfb14a86c8
   pub_semver: ^2.1.1
   pubspec_parse: ^1.2.0
-  smithy:
-    path: ../smithy/smithy
+  smithy: ">=0.4.0+1 <0.5.0"
   smithy_codegen:
     path: ../smithy/smithy_codegen
   stream_transform: ^2.0.0

diff --git a/packages/aft/test/e2e_test.dart b/packages/aft/test/e2e_test.dart
@@ -283,7 +283,7 @@ Initial version.
           for (final entry in packages.entries) {
             test(entry.key, () {
               final package = repo.allPackages[entry.key]!;
-              final lastBump = repo.latestBumpRef(package.name);
+              final lastBump = repo.latestBumpRef(package);
               expect(lastBump, packageBumps[package.name]);
 
               final numCommits = entry.value;

diff --git a/packages/amplify/amplify_flutter/CHANGELOG.md b/packages/amplify/amplify_flutter/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 1.0.0-next.4
+
+### Breaking Changes
+- fix(auth)!: Fetch Auth Session offline behavior ([#2585](https://github.com/aws-amplify/amplify-flutter/pull/2585))
+
+### Fixes
+- fix(api): do not include null values in ModelMutations.create ([#2504](https://github.com/aws-amplify/amplify-flutter/pull/2504))
+- fix(api): model helpers use targetNames in schemas with CPK enabled ([#2559](https://github.com/aws-amplify/amplify-flutter/pull/2559))
+- fix(auth): SessionExpired Auth Hub event ([#2609](https://github.com/aws-amplify/amplify-flutter/pull/2609))
+- fix(datastore): prevent unhandled exception crashing App rebuilding sync expression
+
+### Features
+- feat(analytics): Legacy data migration of Pinpoint Endpoint ID ([#2489](https://github.com/aws-amplify/amplify-flutter/pull/2489))
+
 ## 1.0.0-next.3
 
 ### Breaking Changes

diff --git a/packages/amplify/amplify_flutter/example/pubspec.yaml b/packages/amplify/amplify_flutter/example/pubspec.yaml
@@ -6,18 +6,12 @@ environment:
   sdk: ">=2.17.0 <3.0.0"
 
 dependencies:
-  amplify_analytics_pinpoint:
-    path: ../../../analytics/amplify_analytics_pinpoint
-  amplify_api:
-    path: ../../../api/amplify_api
-  amplify_auth_cognito:
-    path: ../../../auth/amplify_auth_cognito
-  amplify_datastore:
-    path: ../../../amplify_datastore
-  amplify_flutter:
-    path: ../
-  amplify_storage_s3:
-    path: ../../../storage/amplify_storage_s3
+  amplify_analytics_pinpoint: ">=1.0.0-next.4 <1.0.0-next.5"
+  amplify_api: ">=1.0.0-next.4 <1.0.0-next.5"
+  amplify_auth_cognito: ">=1.0.0-next.4 <1.0.0-next.5"
+  amplify_datastore: ">=1.0.0-next.4 <1.0.0-next.5"
+  amplify_flutter: ">=1.0.0-next.4 <1.0.0-next.5"
+  amplify_storage_s3: ">=1.0.0-next.4 <1.0.0-next.5"
   flutter:
     sdk: flutter
 

diff --git a/packages/amplify/amplify_flutter/pubspec.yaml b/packages/amplify/amplify_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: amplify_flutter
 description: The top level Flutter package for the AWS Amplify libraries.
-version: 1.0.0-next.3
+version: 1.0.0-next.4
 homepage: https://docs.amplify.aws/lib/q/platform/flutter/
 repository: https://github.com/aws-amplify/amplify-flutter/tree/next/packages/amplify/amplify_flutter
 issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues
@@ -19,25 +19,25 @@ platforms:
   web:
 
 dependencies:
-  amplify_core: ">=1.0.0-next.3 <1.0.0-next.4"
-  amplify_datastore_plugin_interface: ">=1.0.0-next.3 <1.0.0-next.4"
-  amplify_flutter_android: ">=1.0.0-next.3 <1.0.0-next.4"
-  amplify_flutter_ios: ">=1.0.0-next.3 <1.0.0-next.4"
+  amplify_core: ">=1.0.0-next.4 <1.0.0-next.5"
+  amplify_datastore_plugin_interface: ">=1.0.0-next.4 <1.0.0-next.5"
+  amplify_flutter_android: ">=1.0.0-next.4 <1.0.0-next.5"
+  amplify_flutter_ios: ">=1.0.0-next.4 <1.0.0-next.5"
   amplify_secure_storage: ">=0.1.4+1 <0.2.0"
-  aws_common: ">=0.3.5+1 <0.4.0"
+  aws_common: ">=0.4.0 <0.5.0"
   collection: ^1.15.0
   flutter:
     sdk: flutter
   meta: ^1.7.0
   plugin_platform_interface: ^2.0.0
 
 dev_dependencies:
-  amplify_analytics_pinpoint:
-  amplify_api:
-  amplify_auth_cognito:
-  amplify_datastore:
+  amplify_analytics_pinpoint: ">=1.0.0-next.4 <1.0.0-next.5"
+  amplify_api: ">=1.0.0-next.4 <1.0.0-next.5"
+  amplify_auth_cognito: ">=1.0.0-next.4 <1.0.0-next.5"
+  amplify_datastore: ">=1.0.0-next.4 <1.0.0-next.5"
   amplify_lints: ^2.0.0
-  amplify_storage_s3:
+  amplify_storage_s3: ">=1.0.0-next.4 <1.0.0-next.5"
   amplify_test:
     path: ../../amplify_test
   build_runner: ^2.0.0

diff --git a/packages/amplify/amplify_flutter_android/CHANGELOG.md b/packages/amplify/amplify_flutter_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.0-next.4
+
+- Minor bug fixes and improvements
+
 ## 1.0.0-next.3
 
 - Minor bug fixes and improvements

diff --git a/packages/amplify/amplify_flutter_android/pubspec.yaml b/packages/amplify/amplify_flutter_android/pubspec.yaml
@@ -1,6 +1,6 @@
 name: amplify_flutter_android
 description: The method channel implementation for amplify_flutter on Android
-version: 1.0.0-next.3
+version: 1.0.0-next.4
 homepage: https://docs.amplify.aws/lib/q/platform/flutter/
 repository: https://github.com/aws-amplify/amplify-flutter/tree/next/packages/amplify/amplify_flutter_android
 issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues

diff --git a/packages/amplify/amplify_flutter_ios/CHANGELOG.md b/packages/amplify/amplify_flutter_ios/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.0-next.4
+
+- Minor bug fixes and improvements
+
 ## 1.0.0-next.3
 
 - Minor bug fixes and improvements

diff --git a/packages/amplify/amplify_flutter_ios/example/pubspec.yaml b/packages/amplify/amplify_flutter_ios/example/pubspec.yaml
@@ -8,21 +8,20 @@ environment:
   flutter: ">=3.0.0"
 
 dependencies:
-  amplify_flutter_ios:
-    path: ../
+  amplify_flutter_ios: ">=1.0.0-next.4 <1.0.0-next.5"
   cupertino_icons: ^1.0.2
   flutter:
     sdk: flutter
 
 dev_dependencies:
-  amplify_analytics_pinpoint: 1.0.0-next.0
-  amplify_api: 1.0.0-next.0
-  amplify_auth_cognito: 1.0.0-next.0
-  amplify_core: 1.0.0-next.0
-  amplify_datastore: 1.0.0-next.0
-  amplify_flutter: 1.0.0-next.0
+  amplify_analytics_pinpoint: ">=1.0.0-next.4 <1.0.0-next.5"
+  amplify_api: ">=1.0.0-next.4 <1.0.0-next.5"
+  amplify_auth_cognito: ">=1.0.0-next.4 <1.0.0-next.5"
+  amplify_core: ">=1.0.0-next.4 <1.0.0-next.5"
+  amplify_datastore: ">=1.0.0-next.4 <1.0.0-next.5"
+  amplify_flutter: ">=1.0.0-next.4 <1.0.0-next.5"
   amplify_lints: ^2.0.0
-  amplify_storage_s3: 1.0.0-next.0
+  amplify_storage_s3: ">=1.0.0-next.4 <1.0.0-next.5"
   amplify_test:
     path: ../../../amplify_test
   flutter_test:

diff --git a/packages/amplify/amplify_flutter_ios/pubspec.yaml b/packages/amplify/amplify_flutter_ios/pubspec.yaml
@@ -1,6 +1,6 @@
 name: amplify_flutter_ios
 description: The method channel implementation for amplify_flutter on iOS
-version: 1.0.0-next.3
+version: 1.0.0-next.4
 homepage: https://docs.amplify.aws/lib/q/platform/flutter/
 repository: https://github.com/aws-amplify/amplify-flutter/tree/next/packages/amplify/amplify_flutter_ios
 issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues
@@ -10,7 +10,7 @@ environment:
   flutter: ">=3.0.0"
 
 dependencies:
-  amplify_core: ">=1.0.0-next.3 <1.0.0-next.4"
+  amplify_core: ">=1.0.0-next.4 <1.0.0-next.5"
   flutter:
     sdk: flutter
 

diff --git a/packages/amplify_core/CHANGELOG.md b/packages/amplify_core/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 1.0.0-next.4
+
+### Breaking Changes
+- fix(auth)!: Fetch Auth Session offline behavior ([#2585](https://github.com/aws-amplify/amplify-flutter/pull/2585))
+
+### Features
+- feat(analytics): Legacy data migration of Pinpoint Endpoint ID ([#2489](https://github.com/aws-amplify/amplify-flutter/pull/2489))
+- feat(storage): allow configuring transfer acceleration
+
+### Fixes
+- fix(api): model helpers use targetNames in schemas with CPK enabled ([#2559](https://github.com/aws-amplify/amplify-flutter/pull/2559))
+- fix(auth): Clear credentials before redirect on Web ([#2603](https://github.com/aws-amplify/amplify-flutter/pull/2603))
+- fix(auth): Refresh token in non-state machine calls ([#2572](https://github.com/aws-amplify/amplify-flutter/pull/2572))
+- fix(auth): SessionExpired Auth Hub event ([#2609](https://github.com/aws-amplify/amplify-flutter/pull/2609))
+- fix(storage): incorrect transferred bytes emitted from upload task
+
 ## 1.0.0-next.3
 
 ### Breaking Changes

diff --git a/packages/amplify_core/pubspec.yaml b/packages/amplify_core/pubspec.yaml
@@ -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: 1.0.0-next.3
+version: 1.0.0-next.4
 homepage: https://docs.amplify.aws/lib/q/platform/flutter/
 repository: https://github.com/aws-amplify/amplify-flutter/tree/next/packages/amplify_core
 issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues
@@ -10,8 +10,8 @@ environment:
 
 dependencies:
   async: ^2.8.0
-  aws_common: ">=0.3.5+1 <0.4.0"
-  aws_signature_v4: ">=0.3.1+1 <0.4.0"
+  aws_common: ">=0.4.0 <0.5.0"
+  aws_signature_v4: ">=0.3.1+2 <0.4.0"
   collection: ^1.15.0
   intl: ^0.17.0
   json_annotation: ^4.7.0

diff --git a/packages/amplify_datastore/CHANGELOG.md b/packages/amplify_datastore/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.0.0-next.4
+
+### Fixes
+- fix(datastore): prevent unhandled exception crashing App rebuilding sync expression
+
 ## 1.0.0-next.3
 
 ### Breaking Changes

diff --git a/packages/amplify_datastore/example/pubspec.yaml b/packages/amplify_datastore/example/pubspec.yaml
@@ -12,18 +12,11 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  amplify_datastore:
-    # When depending on this package from a real application you should use:
-    #   amplify_datastore: ^x.y.z
-    # See https://dart.dev/tools/pub/dependencies#version-constraints
-    # The example app is bundled with the plugin so we use a path dependency on
-    # the parent directory to use the current plugin's version.
-    path: ../
+  amplify_datastore: ">=1.0.0-next.4 <1.0.0-next.5"
   # Uncomment the below lines to enable online sync
   # amplify_api:
   #   path: ../../api/amplify_api
-  amplify_flutter:
-    path: ../../amplify/amplify_flutter
+  amplify_flutter: ">=1.0.0-next.4 <1.0.0-next.5"
   flutter_driver:
     sdk: flutter
   integration_test: