From a333a28fc1d347a692fa71c4cfa64326a2a63e80 Mon Sep 17 00:00:00 2001 From: Felix Angelov Date: Mon, 17 Mar 2025 14:05:29 -0500 Subject: [PATCH] fix(shorebird_cli): `shorebird release windows` should support `--flutter-version=` (#2983) --- .../commands/release/windows_releaser.dart | 7 +------ .../lib/src/platform/windows.dart | 5 ----- .../release/windows_releaser_test.dart | 20 ------------------- 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/packages/shorebird_cli/lib/src/commands/release/windows_releaser.dart b/packages/shorebird_cli/lib/src/commands/release/windows_releaser.dart index 7aea55e2..41f9e53b 100644 --- a/packages/shorebird_cli/lib/src/commands/release/windows_releaser.dart +++ b/packages/shorebird_cli/lib/src/commands/release/windows_releaser.dart @@ -69,12 +69,7 @@ To change the version of this release, change your app's version in your pubspec final version = await shorebirdFlutter.resolveFlutterVersion( flutterVersionArg, ); - final gitHash = await shorebirdFlutter.getRevisionForVersion( - flutterVersionArg, - ); - if (version != null && - version < minimumSupportedWindowsFlutterVersion && - !windowsFlutterGitHashesBelowMinVersion.contains(gitHash)) { + if (version != null && version < minimumSupportedWindowsFlutterVersion) { logger.err(''' Windows releases are not supported with Flutter versions older than $minimumSupportedWindowsFlutterVersion. For more information see: ${supportedFlutterVersionsUrl.toLink()}'''); diff --git a/packages/shorebird_cli/lib/src/platform/windows.dart b/packages/shorebird_cli/lib/src/platform/windows.dart index e6fde316..7d286515 100644 --- a/packages/shorebird_cli/lib/src/platform/windows.dart +++ b/packages/shorebird_cli/lib/src/platform/windows.dart @@ -11,8 +11,3 @@ const primaryWindowsReleaseArtifactArch = 'win_archive'; /// The minimum allowed Flutter version for creating Windows releases. final minimumSupportedWindowsFlutterVersion = Version(3, 27, 2); - -/// Revisions of Flutter 3.27.1 that support windows. -const windowsFlutterGitHashesBelowMinVersion = { - '56228c343d6c7fd3e1e548dbb290f9713bb22aa9', -}; diff --git a/packages/shorebird_cli/test/src/commands/release/windows_releaser_test.dart b/packages/shorebird_cli/test/src/commands/release/windows_releaser_test.dart index e2e2093e..6750133c 100644 --- a/packages/shorebird_cli/test/src/commands/release/windows_releaser_test.dart +++ b/packages/shorebird_cli/test/src/commands/release/windows_releaser_test.dart @@ -246,9 +246,6 @@ To change the version of this release, change your app's version in your pubspec when( () => shorebirdFlutter.resolveFlutterVersion('3.27.1'), ).thenAnswer((_) async => Version(3, 27, 1)); - when( - () => shorebirdFlutter.getRevisionForVersion(any()), - ).thenAnswer((_) async => 'deadbeef'); }); test('logs error and exits with usage err', () async { @@ -263,23 +260,6 @@ Windows releases are not supported with Flutter versions older than $minimumSupp For more information see: ${supportedFlutterVersionsUrl.toLink()}'''), ).called(1); }); - - group('when flutter version is 3.27.1 but hash is supported', () { - setUp(() { - when( - () => shorebirdFlutter.getRevisionForVersion(any()), - ).thenAnswer( - (_) async => windowsFlutterGitHashesBelowMinVersion.first, - ); - }); - - test('completes normally', () async { - await expectLater( - runWithOverrides(releaser.assertPreconditions), - completes, - ); - }); - }); }); });