From dc18f4d18d15051f8349bf08b3f936037264a6db Mon Sep 17 00:00:00 2001 From: Jordan Nelson Date: Thu, 12 Sep 2024 12:37:22 -0400 Subject: [PATCH] chore: fix `aft version-bump` (#5436) * fix: properly handle component propagation * chore: add test for multi package update with breaking common package --- packages/aft/lib/src/repo.dart | 20 +- .../data/snapshots/multi_package_update.diff | 65 ++- ...i_package_update_with_breaking_common.diff | 386 ++++++++++++++++++ .../snapshots/single_dart_package_feat.diff | 3 - .../data/snapshots/single_package_feat.diff | 42 ++ .../test/version_bump/version_bump_test.dart | 23 ++ 6 files changed, 486 insertions(+), 53 deletions(-) create mode 100644 packages/aft/test/version_bump/data/snapshots/multi_package_update_with_breaking_common.diff diff --git a/packages/aft/lib/src/repo.dart b/packages/aft/lib/src/repo.dart index 010234a5b0..b2d66ddfc6 100644 --- a/packages/aft/lib/src/repo.dart +++ b/packages/aft/lib/src/repo.dart @@ -298,7 +298,6 @@ class Repo { required VersionBumpType type, required bool Function(PackageInfo) canBump, required bool includeInChangelog, - bool? propagateToComponent, }) { logger.verbose('bumpVersion ${package.name} $commit'); final componentName = aftConfig.componentForPackage(package.name); @@ -317,7 +316,7 @@ class Repo { ], (version) => version, )!; - propagateToComponent ??= component != null && + final propagateToComponent = component != null && component.propagate.propagateToComponent( currentVersion, newVersion, @@ -359,11 +358,13 @@ class Repo { pkg.pubspecInfo.pubspec.dependencies.keys.contains(package.name) || pkg.pubspecInfo.pubspec.devDependencies.keys.contains(package.name), ); - if (commit.isBreakingChange) { - // Back-propagate to all dependent packages for breaking changes. + if (commit.isBreakingChange || propagateToComponent) { + // Back-propagate to all dependent packages for breaking changes or + // changes that need to propagate to a component. // - // Since we set semantic version constraints, only a breaking change - // in a direct dependency necessitates a version bump. + // Since we set semantic version constraints, only a breaking change in + // a direct dependency or a change that requires propagation + // necessitates a version bump. logger.verbose( 'Breaking change. Performing dfs on dependent packages...', ); @@ -380,12 +381,6 @@ class Repo { } updateConstraint(package, dependent); } - } else if (type == VersionBumpType.nonBreaking) { - // For non-breaking changes, we still need to update all constraints - // since we "pin" to minor versions. - for (final dependent in packageDependents) { - updateConstraint(package, dependent); - } } // Propagate to all component packages. @@ -408,7 +403,6 @@ class Repo { type: type, canBump: canBump, includeInChangelog: false, - propagateToComponent: false, ); }, ); diff --git a/packages/aft/test/version_bump/data/snapshots/multi_package_update.diff b/packages/aft/test/version_bump/data/snapshots/multi_package_update.diff index ef6cbbf624..e26bb90f85 100644 --- a/packages/aft/test/version_bump/data/snapshots/multi_package_update.diff +++ b/packages/aft/test/version_bump/data/snapshots/multi_package_update.diff @@ -12,8 +12,6 @@ diff --git a/packages/amplify/amplify_flutter/pubspec.yaml b/packages/amplify/am +version: 2.4.0 - amplify_core: ">=2.3.0 <2.4.0" + amplify_core: ">=2.4.0 <2.5.0" -- aws_common: ">=0.7.1 <0.8.0" -+ aws_common: ">=0.7.2 <0.8.0" diff --git a/packages/amplify_core/CHANGELOG.md b/packages/amplify_core/CHANGELOG.md +## 2.4.0 + @@ -26,8 +24,6 @@ diff --git a/packages/amplify_core/CHANGELOG.md b/packages/amplify_core/CHANGELO diff --git a/packages/amplify_core/pubspec.yaml b/packages/amplify_core/pubspec.yaml -version: 2.3.0 +version: 2.4.0 -- aws_common: ">=0.7.1 <0.8.0" -+ aws_common: ">=0.7.2 <0.8.0" diff --git a/packages/amplify_datastore/CHANGELOG.md b/packages/amplify_datastore/CHANGELOG.md +## 2.4.0 + @@ -60,13 +56,16 @@ diff --git a/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml b/packag +version: 2.4.0 - amplify_core: ">=2.3.0 <2.4.0" + amplify_core: ">=2.4.0 <2.5.0" -- aws_common: ">=0.7.1 <0.8.0" -+ aws_common: ">=0.7.2 <0.8.0" +diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/CHANGELOG.md b/packages/analytics/amplify_analytics_pinpoint_dart/CHANGELOG.md ++## 0.4.4 ++ ++- Minor bug fixes and improvements ++ diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml +-version: 0.4.3 ++version: 0.4.4 - amplify_core: ">=2.3.0 <2.4.0" + amplify_core: ">=2.4.0 <2.5.0" -- aws_common: ">=0.7.1 <0.8.0" -+ aws_common: ">=0.7.2 <0.8.0" diff --git a/packages/api/amplify_api/CHANGELOG.md b/packages/api/amplify_api/CHANGELOG.md +## 2.4.0 + @@ -79,11 +78,16 @@ diff --git a/packages/api/amplify_api/pubspec.yaml b/packages/api/amplify_api/pu - amplify_flutter: ">=2.3.0 <2.4.0" + amplify_core: ">=2.4.0 <2.5.0" + amplify_flutter: ">=2.4.0 <2.5.0" +diff --git a/packages/api/amplify_api_dart/CHANGELOG.md b/packages/api/amplify_api_dart/CHANGELOG.md ++## 0.5.4 ++ ++- Minor bug fixes and improvements ++ diff --git a/packages/api/amplify_api_dart/pubspec.yaml b/packages/api/amplify_api_dart/pubspec.yaml +-version: 0.5.3 ++version: 0.5.4 - amplify_core: ">=2.3.0 <2.4.0" + amplify_core: ">=2.4.0 <2.5.0" -- aws_common: ">=0.7.1 <0.8.0" -+ aws_common: ">=0.7.2 <0.8.0" diff --git a/packages/auth/amplify_auth_cognito/CHANGELOG.md b/packages/auth/amplify_auth_cognito/CHANGELOG.md +## 2.4.0 + @@ -115,17 +119,20 @@ diff --git a/packages/auth/amplify_auth_cognito_dart/pubspec.yaml b/packages/aut +version: 0.11.4 - amplify_core: ">=2.3.0 <2.4.0" + amplify_core: ">=2.4.0 <2.5.0" -- aws_common: ">=0.7.1 <0.8.0" -+ aws_common: ">=0.7.2 <0.8.0" +diff --git a/packages/authenticator/amplify_authenticator/CHANGELOG.md b/packages/authenticator/amplify_authenticator/CHANGELOG.md ++## 2.1.2 ++ ++- Minor bug fixes and improvements ++ diff --git a/packages/authenticator/amplify_authenticator/pubspec.yaml b/packages/authenticator/amplify_authenticator/pubspec.yaml +-version: 2.1.1 ++version: 2.1.2 - amplify_auth_cognito: ">=2.3.0 <2.4.0" - amplify_core: ">=2.3.0 <2.4.0" - amplify_flutter: ">=2.3.0 <2.4.0" + amplify_auth_cognito: ">=2.4.0 <2.5.0" + amplify_core: ">=2.4.0 <2.5.0" + amplify_flutter: ">=2.4.0 <2.5.0" -- aws_common: ">=0.7.1 <0.8.0" -+ aws_common: ">=0.7.2 <0.8.0" diff --git a/packages/aws_common/CHANGELOG.md b/packages/aws_common/CHANGELOG.md +## 0.7.2 + @@ -135,9 +142,6 @@ diff --git a/packages/aws_common/CHANGELOG.md b/packages/aws_common/CHANGELOG.md diff --git a/packages/aws_common/pubspec.yaml b/packages/aws_common/pubspec.yaml -version: 0.7.1 +version: 0.7.2 -diff --git a/packages/aws_signature_v4/pubspec.yaml b/packages/aws_signature_v4/pubspec.yaml -- aws_common: ">=0.7.1 <0.8.0" -+ aws_common: ">=0.7.2 <0.8.0" diff --git a/packages/common/amplify_db_common/CHANGELOG.md b/packages/common/amplify_db_common/CHANGELOG.md +## 0.4.4 + @@ -160,8 +164,6 @@ diff --git a/packages/common/amplify_db_common_dart/pubspec.yaml b/packages/comm +version: 0.4.5 - amplify_core: ">=2.3.0 <2.4.0" + amplify_core: ">=2.4.0 <2.5.0" -- aws_common: ">=0.7.1 <0.8.0" -+ aws_common: ">=0.7.2 <0.8.0" diff --git a/packages/notifications/push/amplify_push_notifications/CHANGELOG.md b/packages/notifications/push/amplify_push_notifications/CHANGELOG.md +## 2.4.0 + @@ -190,8 +192,6 @@ diff --git a/packages/notifications/push/amplify_push_notifications_pinpoint/pub + amplify_core: ">=2.4.0 <2.5.0" + amplify_flutter: ">=2.4.0 <2.5.0" + amplify_push_notifications: ">=2.4.0 <2.5.0" -- aws_common: ">=0.7.1 <0.8.0" -+ aws_common: ">=0.7.2 <0.8.0" diff --git a/packages/secure_storage/amplify_secure_storage/CHANGELOG.md b/packages/secure_storage/amplify_secure_storage/CHANGELOG.md +## 0.5.5 + @@ -200,15 +200,6 @@ diff --git a/packages/secure_storage/amplify_secure_storage/CHANGELOG.md b/packa diff --git a/packages/secure_storage/amplify_secure_storage/pubspec.yaml b/packages/secure_storage/amplify_secure_storage/pubspec.yaml -version: 0.5.4 +version: 0.5.5 -diff --git a/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml b/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml -- aws_common: ">=0.7.1 <0.8.0" -+ aws_common: ">=0.7.2 <0.8.0" -diff --git a/packages/smithy/smithy/pubspec.yaml b/packages/smithy/smithy/pubspec.yaml -- aws_common: ">=0.7.1 <0.8.0" -+ aws_common: ">=0.7.2 <0.8.0" -diff --git a/packages/smithy/smithy_aws/pubspec.yaml b/packages/smithy/smithy_aws/pubspec.yaml -- aws_common: ">=0.7.1 <0.8.0" -+ aws_common: ">=0.7.2 <0.8.0" diff --git a/packages/storage/amplify_storage_s3/CHANGELOG.md b/packages/storage/amplify_storage_s3/CHANGELOG.md +## 2.4.0 + @@ -219,13 +210,13 @@ diff --git a/packages/storage/amplify_storage_s3/pubspec.yaml b/packages/storage +version: 2.4.0 - amplify_core: ">=2.3.0 <2.4.0" + amplify_core: ">=2.4.0 <2.5.0" -- aws_common: ">=0.7.1 <0.8.0" -+ aws_common: ">=0.7.2 <0.8.0" +diff --git a/packages/storage/amplify_storage_s3_dart/CHANGELOG.md b/packages/storage/amplify_storage_s3_dart/CHANGELOG.md ++## 0.4.4 ++ ++- Minor bug fixes and improvements ++ diff --git a/packages/storage/amplify_storage_s3_dart/pubspec.yaml b/packages/storage/amplify_storage_s3_dart/pubspec.yaml +-version: 0.4.3 ++version: 0.4.4 - amplify_core: ">=2.3.0 <2.4.0" + amplify_core: ">=2.4.0 <2.5.0" -- aws_common: ">=0.7.1 <0.8.0" -+ aws_common: ">=0.7.2 <0.8.0" -diff --git a/packages/worker_bee/worker_bee/pubspec.yaml b/packages/worker_bee/worker_bee/pubspec.yaml -- aws_common: ">=0.7.1 <0.8.0" -+ aws_common: ">=0.7.2 <0.8.0" diff --git a/packages/aft/test/version_bump/data/snapshots/multi_package_update_with_breaking_common.diff b/packages/aft/test/version_bump/data/snapshots/multi_package_update_with_breaking_common.diff new file mode 100644 index 0000000000..e012dcdb3c --- /dev/null +++ b/packages/aft/test/version_bump/data/snapshots/multi_package_update_with_breaking_common.diff @@ -0,0 +1,386 @@ +diff --git a/packages/amplify/amplify_flutter/CHANGELOG.md b/packages/amplify/amplify_flutter/CHANGELOG.md ++## 2.4.0 ++ ++### Features ++- feat: test core/auth feat ++ ++### Fixes ++- fix: test auth fix ++ +diff --git a/packages/amplify/amplify_flutter/pubspec.yaml b/packages/amplify/amplify_flutter/pubspec.yaml +-version: 2.3.0 ++version: 2.4.0 +- amplify_core: ">=2.3.0 <2.4.0" +- amplify_secure_storage: ">=0.5.4 <0.6.0" +- aws_common: ">=0.7.1 <0.8.0" ++ amplify_core: ">=2.4.0 <2.5.0" ++ amplify_secure_storage: ">=0.5.5 <0.6.0" ++ aws_common: ">=0.8.0 <0.9.0" +diff --git a/packages/amplify_core/CHANGELOG.md b/packages/amplify_core/CHANGELOG.md ++## 2.4.0 ++ ++### Features ++- feat: test core/auth feat ++ ++### Fixes ++- fix: test auth fix ++ +diff --git a/packages/amplify_core/pubspec.yaml b/packages/amplify_core/pubspec.yaml +-version: 2.3.0 ++version: 2.4.0 +- aws_common: ">=0.7.1 <0.8.0" +- aws_signature_v4: ">=0.6.1 <0.7.0" ++ aws_common: ">=0.8.0 <0.9.0" ++ aws_signature_v4: ">=0.6.2 <0.7.0" +diff --git a/packages/amplify_datastore/CHANGELOG.md b/packages/amplify_datastore/CHANGELOG.md ++## 2.4.0 ++ ++- Minor bug fixes and improvements ++ +diff --git a/packages/amplify_datastore/pubspec.yaml b/packages/amplify_datastore/pubspec.yaml +-version: 2.3.0 ++version: 2.4.0 +- amplify_datastore_plugin_interface: ">=2.3.0 <2.4.0" +- amplify_core: ">=2.3.0 <2.4.0" ++ amplify_datastore_plugin_interface: ">=2.4.0 <2.5.0" ++ amplify_core: ">=2.4.0 <2.5.0" +diff --git a/packages/amplify_datastore_plugin_interface/CHANGELOG.md b/packages/amplify_datastore_plugin_interface/CHANGELOG.md ++## 2.4.0 ++ ++- Minor bug fixes and improvements ++ +diff --git a/packages/amplify_datastore_plugin_interface/pubspec.yaml b/packages/amplify_datastore_plugin_interface/pubspec.yaml +-version: 2.3.0 ++version: 2.4.0 +- amplify_core: ">=2.3.0 <2.4.0" ++ amplify_core: ">=2.4.0 <2.5.0" +diff --git a/packages/analytics/amplify_analytics_pinpoint/CHANGELOG.md b/packages/analytics/amplify_analytics_pinpoint/CHANGELOG.md ++## 2.4.0 ++ ++- Minor bug fixes and improvements ++ +diff --git a/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml +-version: 2.3.0 ++version: 2.4.0 +- amplify_analytics_pinpoint_dart: ">=0.4.3 <0.5.0" +- amplify_core: ">=2.3.0 <2.4.0" +- amplify_db_common: ">=0.4.3 <0.5.0" +- amplify_secure_storage: ">=0.5.4 <0.6.0" +- aws_common: ">=0.7.1 <0.8.0" ++ amplify_analytics_pinpoint_dart: ">=0.4.4 <0.5.0" ++ amplify_core: ">=2.4.0 <2.5.0" ++ amplify_db_common: ">=0.4.4 <0.5.0" ++ amplify_secure_storage: ">=0.5.5 <0.6.0" ++ aws_common: ">=0.8.0 <0.9.0" +diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/CHANGELOG.md b/packages/analytics/amplify_analytics_pinpoint_dart/CHANGELOG.md ++## 0.4.4 ++ ++- Minor bug fixes and improvements ++ +diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml +-version: 0.4.3 ++version: 0.4.4 +- amplify_core: ">=2.3.0 <2.4.0" +- amplify_db_common_dart: ">=0.4.4 <0.5.0" +- amplify_secure_storage_dart: ">=0.5.1 <0.6.0" +- aws_common: ">=0.7.1 <0.8.0" +- aws_signature_v4: ">=0.6.1 <0.7.0" ++ amplify_core: ">=2.4.0 <2.5.0" ++ amplify_db_common_dart: ">=0.4.5 <0.5.0" ++ amplify_secure_storage_dart: ">=0.5.2 <0.6.0" ++ aws_common: ">=0.8.0 <0.9.0" ++ aws_signature_v4: ">=0.6.2 <0.7.0" +- smithy: ">=0.7.1 <0.8.0" +- smithy_aws: ">=0.7.0 <0.8.0" ++ smithy: ">=0.7.2 <0.8.0" ++ smithy_aws: ">=0.7.2 <0.8.0" +diff --git a/packages/api/amplify_api/CHANGELOG.md b/packages/api/amplify_api/CHANGELOG.md ++## 2.4.0 ++ ++- Minor bug fixes and improvements ++ +diff --git a/packages/api/amplify_api/pubspec.yaml b/packages/api/amplify_api/pubspec.yaml +-version: 2.3.0 ++version: 2.4.0 +- amplify_api_dart: ">=0.5.3 <0.6.0" +- amplify_core: ">=2.3.0 <2.4.0" +- amplify_flutter: ">=2.3.0 <2.4.0" ++ amplify_api_dart: ">=0.5.4 <0.6.0" ++ amplify_core: ">=2.4.0 <2.5.0" ++ amplify_flutter: ">=2.4.0 <2.5.0" +diff --git a/packages/api/amplify_api_dart/CHANGELOG.md b/packages/api/amplify_api_dart/CHANGELOG.md ++## 0.5.4 ++ ++- Minor bug fixes and improvements ++ +diff --git a/packages/api/amplify_api_dart/pubspec.yaml b/packages/api/amplify_api_dart/pubspec.yaml +-version: 0.5.3 ++version: 0.5.4 +- amplify_core: ">=2.3.0 <2.4.0" ++ amplify_core: ">=2.4.0 <2.5.0" +- aws_common: ">=0.7.1 <0.8.0" ++ aws_common: ">=0.8.0 <0.9.0" +- aws_signature_v4: ">=0.6.1 <0.7.0" ++ aws_signature_v4: ">=0.6.2 <0.7.0" +diff --git a/packages/auth/amplify_auth_cognito/CHANGELOG.md b/packages/auth/amplify_auth_cognito/CHANGELOG.md ++## 2.4.0 ++ ++### Features ++- feat: test core/auth feat ++ ++### Fixes ++- fix: test auth fix ++ +diff --git a/packages/auth/amplify_auth_cognito/pubspec.yaml b/packages/auth/amplify_auth_cognito/pubspec.yaml +-version: 2.3.0 ++version: 2.4.0 +- amplify_analytics_pinpoint: ">=2.3.0 <2.4.0" +- amplify_analytics_pinpoint_dart: ">=0.4.3 <0.5.0" +- amplify_auth_cognito_dart: ">=0.11.3 <0.12.0" +- amplify_core: ">=2.3.0 <2.4.0" +- amplify_flutter: ">=2.3.0 <2.4.0" +- amplify_secure_storage: ">=0.5.4 <0.6.0" ++ amplify_analytics_pinpoint: ">=2.4.0 <2.5.0" ++ amplify_analytics_pinpoint_dart: ">=0.4.4 <0.5.0" ++ amplify_auth_cognito_dart: ">=0.11.4 <0.12.0" ++ amplify_core: ">=2.4.0 <2.5.0" ++ amplify_flutter: ">=2.4.0 <2.5.0" ++ amplify_secure_storage: ">=0.5.5 <0.6.0" +diff --git a/packages/auth/amplify_auth_cognito_dart/CHANGELOG.md b/packages/auth/amplify_auth_cognito_dart/CHANGELOG.md ++## 0.11.4 ++ ++### Fixes ++- fix: test auth fix ++ +diff --git a/packages/auth/amplify_auth_cognito_dart/pubspec.yaml b/packages/auth/amplify_auth_cognito_dart/pubspec.yaml +-version: 0.11.3 ++version: 0.11.4 +- amplify_analytics_pinpoint_dart: ">=0.4.3 <0.5.0" +- amplify_core: ">=2.3.0 <2.4.0" +- amplify_secure_storage_dart: ">=0.5.1 <0.6.0" ++ amplify_analytics_pinpoint_dart: ">=0.4.4 <0.5.0" ++ amplify_core: ">=2.4.0 <2.5.0" ++ amplify_secure_storage_dart: ">=0.5.2 <0.6.0" +- aws_common: ">=0.7.1 <0.8.0" +- aws_signature_v4: ">=0.6.1 <0.7.0" ++ aws_common: ">=0.8.0 <0.9.0" ++ aws_signature_v4: ">=0.6.2 <0.7.0" +- smithy: ">=0.7.1 <0.8.0" +- smithy_aws: ">=0.7.0 <0.8.0" ++ smithy: ">=0.7.2 <0.8.0" ++ smithy_aws: ">=0.7.2 <0.8.0" +- worker_bee: ">=0.3.1 <0.4.0" ++ worker_bee: ">=0.3.2 <0.4.0" +- worker_bee_builder: ">=0.3.1 <0.4.0" ++ worker_bee_builder: ">=0.3.2 <0.4.0" +diff --git a/packages/authenticator/amplify_authenticator/CHANGELOG.md b/packages/authenticator/amplify_authenticator/CHANGELOG.md ++## 2.1.2 ++ ++- Minor bug fixes and improvements ++ +diff --git a/packages/authenticator/amplify_authenticator/pubspec.yaml b/packages/authenticator/amplify_authenticator/pubspec.yaml +-version: 2.1.1 ++version: 2.1.2 +- amplify_auth_cognito: ">=2.3.0 <2.4.0" +- amplify_core: ">=2.3.0 <2.4.0" +- amplify_flutter: ">=2.3.0 <2.4.0" ++ amplify_auth_cognito: ">=2.4.0 <2.5.0" ++ amplify_core: ">=2.4.0 <2.5.0" ++ amplify_flutter: ">=2.4.0 <2.5.0" +- aws_common: ">=0.7.1 <0.8.0" ++ aws_common: ">=0.8.0 <0.9.0" +- smithy: ">=0.7.1 <0.8.0" ++ smithy: ">=0.7.2 <0.8.0" +diff --git a/packages/aws_common/CHANGELOG.md b/packages/aws_common/CHANGELOG.md ++## 0.8.0 ++ ++### Breaking Changes ++- feat!: test breaking common feat ++ +diff --git a/packages/aws_common/pubspec.yaml b/packages/aws_common/pubspec.yaml +-version: 0.7.1 ++version: 0.8.0 +diff --git a/packages/aws_signature_v4/CHANGELOG.md b/packages/aws_signature_v4/CHANGELOG.md ++## 0.6.2 ++ ++- Minor bug fixes and improvements ++ +diff --git a/packages/aws_signature_v4/pubspec.yaml b/packages/aws_signature_v4/pubspec.yaml +-version: 0.6.1 ++version: 0.6.2 +- aws_common: ">=0.7.1 <0.8.0" ++ aws_common: ">=0.8.0 <0.9.0" +diff --git a/packages/common/amplify_db_common/CHANGELOG.md b/packages/common/amplify_db_common/CHANGELOG.md ++## 0.4.4 ++ ++### Fixes ++- fix: test db common fix ++ +diff --git a/packages/common/amplify_db_common/pubspec.yaml b/packages/common/amplify_db_common/pubspec.yaml +-version: 0.4.3 ++version: 0.4.4 +- amplify_db_common_dart: ">=0.4.4 <0.5.0" ++ amplify_db_common_dart: ">=0.4.5 <0.5.0" +diff --git a/packages/common/amplify_db_common_dart/CHANGELOG.md b/packages/common/amplify_db_common_dart/CHANGELOG.md ++## 0.4.5 ++ ++### Fixes ++- fix: test db common fix ++ +diff --git a/packages/common/amplify_db_common_dart/pubspec.yaml b/packages/common/amplify_db_common_dart/pubspec.yaml +-version: 0.4.4 ++version: 0.4.5 +- amplify_core: ">=2.3.0 <2.4.0" ++ amplify_core: ">=2.4.0 <2.5.0" +- aws_common: ">=0.7.1 <0.8.0" ++ aws_common: ">=0.8.0 <0.9.0" +diff --git a/packages/notifications/push/amplify_push_notifications/CHANGELOG.md b/packages/notifications/push/amplify_push_notifications/CHANGELOG.md ++## 2.4.0 ++ ++- Minor bug fixes and improvements ++ +diff --git a/packages/notifications/push/amplify_push_notifications/pubspec.yaml b/packages/notifications/push/amplify_push_notifications/pubspec.yaml +-version: 2.3.0 ++version: 2.4.0 +- amplify_core: ">=2.3.0 <2.4.0" +- amplify_secure_storage: ">=0.5.4 <0.6.0" ++ amplify_core: ">=2.4.0 <2.5.0" ++ amplify_secure_storage: ">=0.5.5 <0.6.0" +- amplify_secure_storage_dart: ">=0.5.1 <0.6.0" ++ amplify_secure_storage_dart: ">=0.5.2 <0.6.0" +- aws_signature_v4: ">=0.6.1 <0.7.0" ++ aws_signature_v4: ">=0.6.2 <0.7.0" +diff --git a/packages/notifications/push/amplify_push_notifications_pinpoint/CHANGELOG.md b/packages/notifications/push/amplify_push_notifications_pinpoint/CHANGELOG.md ++## 2.4.0 ++ ++- Minor bug fixes and improvements ++ +diff --git a/packages/notifications/push/amplify_push_notifications_pinpoint/pubspec.yaml b/packages/notifications/push/amplify_push_notifications_pinpoint/pubspec.yaml +-version: 2.3.0 ++version: 2.4.0 +- amplify_analytics_pinpoint: ">=2.3.0 <2.4.0" +- amplify_analytics_pinpoint_dart: ">=0.4.3 <0.5.0" +- amplify_auth_cognito: ">=2.3.0 <2.4.0" +- amplify_core: ">=2.3.0 <2.4.0" +- amplify_flutter: ">=2.3.0 <2.4.0" +- amplify_push_notifications: ">=2.3.0 <2.4.0" +- amplify_secure_storage: ">=0.5.4 <0.6.0" ++ amplify_analytics_pinpoint: ">=2.4.0 <2.5.0" ++ amplify_analytics_pinpoint_dart: ">=0.4.4 <0.5.0" ++ amplify_auth_cognito: ">=2.4.0 <2.5.0" ++ amplify_core: ">=2.4.0 <2.5.0" ++ amplify_flutter: ">=2.4.0 <2.5.0" ++ amplify_push_notifications: ">=2.4.0 <2.5.0" ++ amplify_secure_storage: ">=0.5.5 <0.6.0" +- amplify_secure_storage_dart: ">=0.5.1 <0.6.0" ++ amplify_secure_storage_dart: ">=0.5.2 <0.6.0" +- aws_common: ">=0.7.1 <0.8.0" +- aws_signature_v4: ">=0.6.1 <0.7.0" ++ aws_common: ">=0.8.0 <0.9.0" ++ aws_signature_v4: ">=0.6.2 <0.7.0" +diff --git a/packages/secure_storage/amplify_secure_storage/CHANGELOG.md b/packages/secure_storage/amplify_secure_storage/CHANGELOG.md ++## 0.5.5 ++ ++- Minor bug fixes and improvements ++ +diff --git a/packages/secure_storage/amplify_secure_storage/pubspec.yaml b/packages/secure_storage/amplify_secure_storage/pubspec.yaml +-version: 0.5.4 ++version: 0.5.5 +- amplify_secure_storage_dart: ">=0.5.1 <0.6.0" ++ amplify_secure_storage_dart: ">=0.5.2 <0.6.0" +diff --git a/packages/secure_storage/amplify_secure_storage_dart/CHANGELOG.md b/packages/secure_storage/amplify_secure_storage_dart/CHANGELOG.md ++## 0.5.2 ++ ++- Minor bug fixes and improvements ++ +diff --git a/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml b/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml +-version: 0.5.1 ++version: 0.5.2 +- aws_common: ">=0.7.1 <0.8.0" ++ aws_common: ">=0.8.0 <0.9.0" +- worker_bee: ">=0.3.1 <0.4.0" ++ worker_bee: ">=0.3.2 <0.4.0" +- worker_bee_builder: ">=0.3.1 <0.4.0" ++ worker_bee_builder: ">=0.3.2 <0.4.0" +diff --git a/packages/smithy/smithy/CHANGELOG.md b/packages/smithy/smithy/CHANGELOG.md ++## 0.7.2 ++ ++- Minor bug fixes and improvements ++ +diff --git a/packages/smithy/smithy/pubspec.yaml b/packages/smithy/smithy/pubspec.yaml +-version: 0.7.1 ++version: 0.7.2 +- aws_common: ">=0.7.1 <0.8.0" ++ aws_common: ">=0.8.0 <0.9.0" +diff --git a/packages/smithy/smithy_aws/CHANGELOG.md b/packages/smithy/smithy_aws/CHANGELOG.md ++## 0.7.2 ++ ++- Minor bug fixes and improvements ++ +diff --git a/packages/smithy/smithy_aws/pubspec.yaml b/packages/smithy/smithy_aws/pubspec.yaml +-version: 0.7.1 ++version: 0.7.2 +- aws_common: ">=0.7.1 <0.8.0" +- aws_signature_v4: ">=0.6.1 <0.7.0" ++ aws_common: ">=0.8.0 <0.9.0" ++ aws_signature_v4: ">=0.6.2 <0.7.0" +- smithy: ">=0.7.1 <0.8.0" ++ smithy: ">=0.7.2 <0.8.0" +diff --git a/packages/storage/amplify_storage_s3/CHANGELOG.md b/packages/storage/amplify_storage_s3/CHANGELOG.md ++## 2.4.0 ++ ++- Minor bug fixes and improvements ++ +diff --git a/packages/storage/amplify_storage_s3/pubspec.yaml b/packages/storage/amplify_storage_s3/pubspec.yaml +-version: 2.3.0 ++version: 2.4.0 +- amplify_core: ">=2.3.0 <2.4.0" +- amplify_db_common: ">=0.4.3 <0.5.0" +- amplify_storage_s3_dart: ">=0.4.3 <0.5.0" +- aws_common: ">=0.7.1 <0.8.0" ++ amplify_core: ">=2.4.0 <2.5.0" ++ amplify_db_common: ">=0.4.4 <0.5.0" ++ amplify_storage_s3_dart: ">=0.4.4 <0.5.0" ++ aws_common: ">=0.8.0 <0.9.0" +- aws_signature_v4: ">=0.6.1 <0.7.0" ++ aws_signature_v4: ">=0.6.2 <0.7.0" +diff --git a/packages/storage/amplify_storage_s3_dart/CHANGELOG.md b/packages/storage/amplify_storage_s3_dart/CHANGELOG.md ++## 0.4.4 ++ ++- Minor bug fixes and improvements ++ +diff --git a/packages/storage/amplify_storage_s3_dart/pubspec.yaml b/packages/storage/amplify_storage_s3_dart/pubspec.yaml +-version: 0.4.3 ++version: 0.4.4 +- amplify_core: ">=2.3.0 <2.4.0" +- amplify_db_common_dart: ">=0.4.4 <0.5.0" ++ amplify_core: ">=2.4.0 <2.5.0" ++ amplify_db_common_dart: ">=0.4.5 <0.5.0" +- aws_common: ">=0.7.1 <0.8.0" +- aws_signature_v4: ">=0.6.1 <0.7.0" ++ aws_common: ">=0.8.0 <0.9.0" ++ aws_signature_v4: ">=0.6.2 <0.7.0" +- smithy: ">=0.7.1 <0.8.0" +- smithy_aws: ">=0.7.0 <0.8.0" ++ smithy: ">=0.7.2 <0.8.0" ++ smithy_aws: ">=0.7.2 <0.8.0" +diff --git a/packages/worker_bee/worker_bee/CHANGELOG.md b/packages/worker_bee/worker_bee/CHANGELOG.md ++## 0.3.2 ++ ++- Minor bug fixes and improvements ++ +diff --git a/packages/worker_bee/worker_bee/pubspec.yaml b/packages/worker_bee/worker_bee/pubspec.yaml +-version: 0.3.1 ++version: 0.3.2 +- aws_common: ">=0.7.1 <0.8.0" ++ aws_common: ">=0.8.0 <0.9.0" +diff --git a/packages/worker_bee/worker_bee_builder/CHANGELOG.md b/packages/worker_bee/worker_bee_builder/CHANGELOG.md ++## 0.3.2 ++ ++- Minor bug fixes and improvements ++ +diff --git a/packages/worker_bee/worker_bee_builder/pubspec.yaml b/packages/worker_bee/worker_bee_builder/pubspec.yaml +-version: 0.3.1 ++version: 0.3.2 +- worker_bee: ">=0.3.1 <0.4.0" ++ worker_bee: ">=0.3.2 <0.4.0" diff --git a/packages/aft/test/version_bump/data/snapshots/single_dart_package_feat.diff b/packages/aft/test/version_bump/data/snapshots/single_dart_package_feat.diff index b548b91dfa..00f72fb4e9 100644 --- a/packages/aft/test/version_bump/data/snapshots/single_dart_package_feat.diff +++ b/packages/aft/test/version_bump/data/snapshots/single_dart_package_feat.diff @@ -1,6 +1,3 @@ -diff --git a/packages/auth/amplify_auth_cognito/pubspec.yaml b/packages/auth/amplify_auth_cognito/pubspec.yaml -- amplify_auth_cognito_dart: ">=0.11.3 <0.12.0" -+ amplify_auth_cognito_dart: ">=0.11.4 <0.12.0" diff --git a/packages/auth/amplify_auth_cognito_dart/CHANGELOG.md b/packages/auth/amplify_auth_cognito_dart/CHANGELOG.md +## 0.11.4 + diff --git a/packages/aft/test/version_bump/data/snapshots/single_package_feat.diff b/packages/aft/test/version_bump/data/snapshots/single_package_feat.diff index 022aea4b17..25a00b3ce8 100644 --- a/packages/aft/test/version_bump/data/snapshots/single_package_feat.diff +++ b/packages/aft/test/version_bump/data/snapshots/single_package_feat.diff @@ -49,7 +49,14 @@ diff --git a/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml b/packag +version: 2.4.0 - amplify_core: ">=2.3.0 <2.4.0" + amplify_core: ">=2.4.0 <2.5.0" +diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/CHANGELOG.md b/packages/analytics/amplify_analytics_pinpoint_dart/CHANGELOG.md ++## 0.4.4 ++ ++- Minor bug fixes and improvements ++ diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml +-version: 0.4.3 ++version: 0.4.4 - amplify_core: ">=2.3.0 <2.4.0" + amplify_core: ">=2.4.0 <2.5.0" diff --git a/packages/api/amplify_api/CHANGELOG.md b/packages/api/amplify_api/CHANGELOG.md @@ -64,7 +71,14 @@ diff --git a/packages/api/amplify_api/pubspec.yaml b/packages/api/amplify_api/pu - amplify_flutter: ">=2.3.0 <2.4.0" + amplify_core: ">=2.4.0 <2.5.0" + amplify_flutter: ">=2.4.0 <2.5.0" +diff --git a/packages/api/amplify_api_dart/CHANGELOG.md b/packages/api/amplify_api_dart/CHANGELOG.md ++## 0.5.4 ++ ++- Minor bug fixes and improvements ++ diff --git a/packages/api/amplify_api_dart/pubspec.yaml b/packages/api/amplify_api_dart/pubspec.yaml +-version: 0.5.3 ++version: 0.5.4 - amplify_core: ">=2.3.0 <2.4.0" + amplify_core: ">=2.4.0 <2.5.0" diff --git a/packages/auth/amplify_auth_cognito/CHANGELOG.md b/packages/auth/amplify_auth_cognito/CHANGELOG.md @@ -82,17 +96,38 @@ diff --git a/packages/auth/amplify_auth_cognito/pubspec.yaml b/packages/auth/amp - amplify_flutter: ">=2.3.0 <2.4.0" + amplify_core: ">=2.4.0 <2.5.0" + amplify_flutter: ">=2.4.0 <2.5.0" +diff --git a/packages/auth/amplify_auth_cognito_dart/CHANGELOG.md b/packages/auth/amplify_auth_cognito_dart/CHANGELOG.md ++## 0.11.4 ++ ++- Minor bug fixes and improvements ++ diff --git a/packages/auth/amplify_auth_cognito_dart/pubspec.yaml b/packages/auth/amplify_auth_cognito_dart/pubspec.yaml +-version: 0.11.3 ++version: 0.11.4 - amplify_core: ">=2.3.0 <2.4.0" + amplify_core: ">=2.4.0 <2.5.0" +diff --git a/packages/authenticator/amplify_authenticator/CHANGELOG.md b/packages/authenticator/amplify_authenticator/CHANGELOG.md ++## 2.1.2 ++ ++- Minor bug fixes and improvements ++ diff --git a/packages/authenticator/amplify_authenticator/pubspec.yaml b/packages/authenticator/amplify_authenticator/pubspec.yaml +-version: 2.1.1 ++version: 2.1.2 - amplify_auth_cognito: ">=2.3.0 <2.4.0" - amplify_core: ">=2.3.0 <2.4.0" - amplify_flutter: ">=2.3.0 <2.4.0" + amplify_auth_cognito: ">=2.4.0 <2.5.0" + amplify_core: ">=2.4.0 <2.5.0" + amplify_flutter: ">=2.4.0 <2.5.0" +diff --git a/packages/common/amplify_db_common_dart/CHANGELOG.md b/packages/common/amplify_db_common_dart/CHANGELOG.md ++## 0.4.5 ++ ++- Minor bug fixes and improvements ++ diff --git a/packages/common/amplify_db_common_dart/pubspec.yaml b/packages/common/amplify_db_common_dart/pubspec.yaml +-version: 0.4.4 ++version: 0.4.5 - amplify_core: ">=2.3.0 <2.4.0" + amplify_core: ">=2.4.0 <2.5.0" diff --git a/packages/notifications/push/amplify_push_notifications/CHANGELOG.md b/packages/notifications/push/amplify_push_notifications/CHANGELOG.md @@ -133,6 +168,13 @@ diff --git a/packages/storage/amplify_storage_s3/pubspec.yaml b/packages/storage +version: 2.4.0 - amplify_core: ">=2.3.0 <2.4.0" + amplify_core: ">=2.4.0 <2.5.0" +diff --git a/packages/storage/amplify_storage_s3_dart/CHANGELOG.md b/packages/storage/amplify_storage_s3_dart/CHANGELOG.md ++## 0.4.4 ++ ++- Minor bug fixes and improvements ++ diff --git a/packages/storage/amplify_storage_s3_dart/pubspec.yaml b/packages/storage/amplify_storage_s3_dart/pubspec.yaml +-version: 0.4.3 ++version: 0.4.4 - amplify_core: ">=2.3.0 <2.4.0" + amplify_core: ">=2.4.0 <2.5.0" diff --git a/packages/aft/test/version_bump/version_bump_test.dart b/packages/aft/test/version_bump/version_bump_test.dart index 2682463b0a..0e3b010376 100644 --- a/packages/aft/test/version_bump/version_bump_test.dart +++ b/packages/aft/test/version_bump/version_bump_test.dart @@ -92,6 +92,29 @@ const tests = { packages: ['amplify_core', 'amplify_auth_cognito'], ), ], + // a multi package update that includes a breaking change in a common package. + 'multi_package_update_with_breaking_common': [ + Change( + title: 'chore: test secure storage / auth chore', + packages: ['amplify_secure_storage', 'amplify_auth_cognito_dart'], + ), + Change( + title: 'fix: test auth fix', + packages: ['amplify_auth_cognito', 'amplify_auth_cognito_dart'], + ), + Change( + title: 'feat!: test breaking common feat', + packages: ['aws_common'], + ), + Change( + title: 'fix: test db common fix', + packages: ['amplify_db_common', 'amplify_db_common_dart'], + ), + Change( + title: 'feat: test core/auth feat', + packages: ['amplify_core', 'amplify_auth_cognito'], + ), + ], }; // run `dart --define=generate-snapshots=true test ./test/version_bump/version_bump_test.dart --use-data-isolate-strategy`