From 9c7ed25b793048c8a3e47dfc86b560027bee8fdd Mon Sep 17 00:00:00 2001 From: Felix Angelov Date: Tue, 25 Mar 2025 15:17:34 -0500 Subject: [PATCH] fix(shorebird_cli): remove outdated note from release output (#3007) --- .../src/commands/release/aar_releaser.dart | 3 - .../release/ios_framework_releaser.dart | 3 - .../src/commands/release/release_command.dart | 7 -- .../lib/src/commands/release/releaser.dart | 4 - .../commands/release/aar_releaser_test.dart | 6 -- .../release/ios_framework_releaser_test.dart | 6 -- .../release/release_command_test.dart | 30 -------- .../src/commands/release/releaser_test.dart | 76 ------------------- 8 files changed, 135 deletions(-) delete mode 100644 packages/shorebird_cli/test/src/commands/release/releaser_test.dart diff --git a/packages/shorebird_cli/lib/src/commands/release/aar_releaser.dart b/packages/shorebird_cli/lib/src/commands/release/aar_releaser.dart index cdfcf452..9ca6e33a 100644 --- a/packages/shorebird_cli/lib/src/commands/release/aar_releaser.dart +++ b/packages/shorebird_cli/lib/src/commands/release/aar_releaser.dart @@ -48,9 +48,6 @@ class AarReleaser extends Releaser { @override String get artifactDisplayName => 'Android archive'; - @override - bool get requiresReleaseVersionArg => true; - @override Future assertPreconditions() async { try { diff --git a/packages/shorebird_cli/lib/src/commands/release/ios_framework_releaser.dart b/packages/shorebird_cli/lib/src/commands/release/ios_framework_releaser.dart index 241b31fc..ca655203 100644 --- a/packages/shorebird_cli/lib/src/commands/release/ios_framework_releaser.dart +++ b/packages/shorebird_cli/lib/src/commands/release/ios_framework_releaser.dart @@ -38,9 +38,6 @@ class IosFrameworkReleaser extends Releaser { p.join(shorebirdEnv.getShorebirdProjectRoot()!.path, 'release'), ); - @override - bool get requiresReleaseVersionArg => true; - @override String get artifactDisplayName => 'iOS framework'; diff --git a/packages/shorebird_cli/lib/src/commands/release/release_command.dart b/packages/shorebird_cli/lib/src/commands/release/release_command.dart index ccd455de..5fcdf95c 100644 --- a/packages/shorebird_cli/lib/src/commands/release/release_command.dart +++ b/packages/shorebird_cli/lib/src/commands/release/release_command.dart @@ -553,12 +553,5 @@ ${summary.join('\n')} logger.info( '''To create a patch for this release, run ${lightCyan.wrap('$baseCommand --release-version=$releaseVersion')}''', ); - - if (!releaser.requiresReleaseVersionArg) { - logger.info(''' - -Note: ${lightCyan.wrap(baseCommand)} without the --release-version option will patch the current version of the app. -'''); - } } } diff --git a/packages/shorebird_cli/lib/src/commands/release/releaser.dart b/packages/shorebird_cli/lib/src/commands/release/releaser.dart index f9da56b2..95037e64 100644 --- a/packages/shorebird_cli/lib/src/commands/release/releaser.dart +++ b/packages/shorebird_cli/lib/src/commands/release/releaser.dart @@ -29,10 +29,6 @@ abstract class Releaser { /// the release command. final String? target; - /// Whether --release-version must be specified to release. Currently only - /// required for add-to-app/hybrid releases (aar and ios-framework). - bool get requiresReleaseVersionArg => false; - /// The type of artifact we are creating a release for. ReleaseType get releaseType; diff --git a/packages/shorebird_cli/test/src/commands/release/aar_releaser_test.dart b/packages/shorebird_cli/test/src/commands/release/aar_releaser_test.dart index 1f7b76f5..9657d033 100644 --- a/packages/shorebird_cli/test/src/commands/release/aar_releaser_test.dart +++ b/packages/shorebird_cli/test/src/commands/release/aar_releaser_test.dart @@ -118,12 +118,6 @@ void main() { }); }); - group('requiresReleaseVersionArg', () { - test('is true', () { - expect(aarReleaser.requiresReleaseVersionArg, isTrue); - }); - }); - group('assertPreconditions', () { group('when validation succeeds', () { setUp(() { diff --git a/packages/shorebird_cli/test/src/commands/release/ios_framework_releaser_test.dart b/packages/shorebird_cli/test/src/commands/release/ios_framework_releaser_test.dart index d30aa13d..79c41502 100644 --- a/packages/shorebird_cli/test/src/commands/release/ios_framework_releaser_test.dart +++ b/packages/shorebird_cli/test/src/commands/release/ios_framework_releaser_test.dart @@ -115,12 +115,6 @@ void main() { ); }); - group('requiresReleaseVersionArg', () { - test('is true', () { - expect(iosFrameworkReleaser.requiresReleaseVersionArg, isTrue); - }); - }); - group('releaseType', () { test('is xcframework', () { expect(iosFrameworkReleaser.releaseType, ReleaseType.iosFramework); diff --git a/packages/shorebird_cli/test/src/commands/release/release_command_test.dart b/packages/shorebird_cli/test/src/commands/release/release_command_test.dart index 017d60e3..523d9353 100644 --- a/packages/shorebird_cli/test/src/commands/release/release_command_test.dart +++ b/packages/shorebird_cli/test/src/commands/release/release_command_test.dart @@ -161,7 +161,6 @@ void main() { when( () => releaser.updatedReleaseMetadata(any()), ).thenAnswer((_) async => UpdateReleaseMetadata.forTest()); - when(() => releaser.requiresReleaseVersionArg).thenReturn(false); when(() => shorebirdEnv.getShorebirdYaml()).thenReturn(shorebirdYaml); when( @@ -268,10 +267,6 @@ void main() { () => logger.info( '''To create a patch for this release, run ${lightCyan.wrap('shorebird patch --platforms=android --release-version=${release.version}')}''', ), - () => logger.info(''' - -Note: ${lightCyan.wrap('shorebird patch --platforms=android')} without the --release-version option will patch the current version of the app. -'''), ]); }); @@ -354,27 +349,6 @@ Note: ${lightCyan.wrap('shorebird patch --platforms=android')} without the --rel }); }); - group('when release version arg is required', () { - setUp(() { - when(() => releaser.requiresReleaseVersionArg).thenReturn(true); - }); - - test( - 'does not print patch instructions for no release version', - () async { - final exitCode = await runWithOverrides(command.run); - expect(exitCode, equals(ExitCode.success.code)); - - verifyNever( - () => logger.info(''' - -Note: ${lightCyan.wrap('shorebird patch --platforms=android')} without the --release-version option will patch the current version of the app. -'''), - ); - }, - ); - }); - group('when flavor and target are provided', () { const flavor = 'test-flavor'; const target = 'test-target'; @@ -409,10 +383,6 @@ Note: ${lightCyan.wrap('shorebird patch --platforms=android')} without the --rel () => logger.info( '''To create a patch for this release, run ${lightCyan.wrap('shorebird patch --platforms=android --flavor=$flavor --target=$target --release-version=${release.version}')}''', ), - () => logger.info(''' - -Note: ${lightCyan.wrap('shorebird patch --platforms=android --flavor=$flavor --target=$target')} without the --release-version option will patch the current version of the app. -'''), ]); }); }); diff --git a/packages/shorebird_cli/test/src/commands/release/releaser_test.dart b/packages/shorebird_cli/test/src/commands/release/releaser_test.dart deleted file mode 100644 index 9570cd54..00000000 --- a/packages/shorebird_cli/test/src/commands/release/releaser_test.dart +++ /dev/null @@ -1,76 +0,0 @@ -import 'dart:io'; - -import 'package:shorebird_cli/src/commands/release/releaser.dart'; -import 'package:shorebird_cli/src/metadata/metadata.dart'; -import 'package:shorebird_cli/src/release_type.dart'; -import 'package:shorebird_code_push_protocol/src/models/release.dart'; -import 'package:test/test.dart'; - -import '../../mocks.dart'; - -void main() { - group(Releaser, () { - group('requiresReleaseVersionArg', () { - test('defaults to false', () { - final releaser = FakeReleaser( - argResults: MockArgResults(), - flavor: 'flavor', - target: 'target', - ); - expect(releaser.requiresReleaseVersionArg, false); - }); - }); - }); -} - -class FakeReleaser extends Releaser { - FakeReleaser({ - required super.argResults, - required super.flavor, - required super.target, - }); - - @override - String get artifactDisplayName => 'Fake artifact'; - - @override - Future buildReleaseArtifacts() { - throw UnimplementedError(); - } - - @override - Future getReleaseVersion({ - required FileSystemEntity releaseArtifactRoot, - }) { - throw UnimplementedError(); - } - - @override - String get postReleaseInstructions => throw UnimplementedError(); - - @override - Future updatedReleaseMetadata( - UpdateReleaseMetadata metadata, - ) => throw UnimplementedError(); - - @override - ReleaseType get releaseType => throw UnimplementedError(); - - @override - Future uploadReleaseArtifacts({ - required Release release, - required String appId, - }) { - throw UnimplementedError(); - } - - @override - Future assertArgsAreValid() { - throw UnimplementedError(); - } - - @override - Future assertPreconditions() { - throw UnimplementedError(); - } -}