From 5d574f9a5f46b8eee6e0fcbdaf8caf08846e6db9 Mon Sep 17 00:00:00 2001
From: Bryan Oltman <bryan@shorebird.dev>
Date: Fri, 10 May 2024 08:27:55 -0700
Subject: [PATCH] fix(shorebird_cli): rename android-artifacts to artifacts

---
 .../src/commands/release/android_releaser.dart |  2 +-
 .../src/commands/release/release_command.dart  |  2 +-
 .../commands/release/aar_releaser_test.dart    |  2 +-
 .../release/android_releaser_test.dart         | 18 +++++++++---------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/shorebird_cli/lib/src/commands/release/android_releaser.dart b/packages/shorebird_cli/lib/src/commands/release/android_releaser.dart
index 704f61e0..db0c8ba4 100644
--- a/packages/shorebird_cli/lib/src/commands/release/android_releaser.dart
+++ b/packages/shorebird_cli/lib/src/commands/release/android_releaser.dart
@@ -38,7 +38,7 @@ class AndroidReleaser extends Releaser {
       .toSet();
 
   /// Whether to generate an APK in addition to the AAB.
-  late bool generateApk = argResults['android-artifact'] as String == 'apk';
+  late bool generateApk = argResults['artifact'] as String == 'apk';
 
   /// Whether to split the APK per ABI. This is not something we support, but
   /// we check for this to provide a more helpful error message.
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 6d19c6ae..9d192d1f 100644
--- a/packages/shorebird_cli/lib/src/commands/release/release_command.dart
+++ b/packages/shorebird_cli/lib/src/commands/release/release_command.dart
@@ -68,7 +68,7 @@ On Xcode builds it is used as "CFBundleVersion".''',
         help: 'The Flutter version to use when building the app (e.g: 3.16.3).',
       )
       ..addOption(
-        'android-artifact',
+        'artifact',
         help:
             '''The type of artifact to generate. Only relevant for Android releases.''',
         allowed: ['aab', 'apk'],
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 4ed824e3..05c0ff43 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
@@ -255,7 +255,7 @@ void main() {
       }
 
       setUp(() {
-        when(() => argResults['android-artifact']).thenReturn('apk');
+        when(() => argResults['artifact']).thenReturn('apk');
         when(
           () => artifactBuilder.buildAar(
             buildNumber: any(named: 'buildNumber'),
diff --git a/packages/shorebird_cli/test/src/commands/release/android_releaser_test.dart b/packages/shorebird_cli/test/src/commands/release/android_releaser_test.dart
index 2755fc36..a1ff0a85 100644
--- a/packages/shorebird_cli/test/src/commands/release/android_releaser_test.dart
+++ b/packages/shorebird_cli/test/src/commands/release/android_releaser_test.dart
@@ -185,7 +185,7 @@ void main() {
     group('assertArgsAreValid', () {
       group('when split-per-abi is true', () {
         setUp(() {
-          when(() => argResults['android-artifact']).thenReturn('apk');
+          when(() => argResults['artifact']).thenReturn('apk');
           when(() => argResults['split-per-abi']).thenReturn(true);
         });
 
@@ -199,7 +199,7 @@ void main() {
 
       group('when arguments are valid', () {
         setUp(() {
-          when(() => argResults['android-artifact']).thenReturn('apk');
+          when(() => argResults['artifact']).thenReturn('apk');
           when(() => argResults['split-per-abi']).thenReturn(false);
         });
 
@@ -218,7 +218,7 @@ void main() {
 
       setUp(() {
         aabFile = File('');
-        when(() => argResults['android-artifact']).thenReturn('aab');
+        when(() => argResults['artifact']).thenReturn('aab');
         when(
           () => artifactBuilder.buildAppBundle(
             flavor: any(named: 'flavor'),
@@ -268,7 +268,7 @@ void main() {
 
       group('when building apk', () {
         setUp(() {
-          when(() => argResults['android-artifact']).thenReturn('apk');
+          when(() => argResults['artifact']).thenReturn('apk');
         });
 
         group('when apk build fails', () {
@@ -322,7 +322,7 @@ void main() {
         const target = 'my-target';
 
         setUp(() {
-          when(() => argResults['android-artifact']).thenReturn('apk');
+          when(() => argResults['artifact']).thenReturn('apk');
           androidReleaser = AndroidReleaser(
             argResults: argResults,
             flavor: flavor,
@@ -470,7 +470,7 @@ void main() {
 
       group('when an apk is generated', () {
         setUp(() {
-          when(() => argResults['android-artifact']).thenReturn('apk');
+          when(() => argResults['artifact']).thenReturn('apk');
         });
 
         test('returns expected metadata', () async {
@@ -493,7 +493,7 @@ void main() {
 
       group('when no apk is generated', () {
         setUp(() {
-          when(() => argResults['android-artifact']).thenReturn('aab');
+          when(() => argResults['artifact']).thenReturn('aab');
         });
 
         test('returns expected metadata', () async {
@@ -536,7 +536,7 @@ void main() {
 
       group('when an apk is generated', () {
         setUp(() {
-          when(() => argResults['android-artifact']).thenReturn('apk');
+          when(() => argResults['artifact']).thenReturn('apk');
         });
 
         test('returns expected instructions', () {
@@ -558,7 +558,7 @@ ${link(uri: Uri.parse('https://support.google.com/googleplay/android-developer/a
 
       group('when no apk is generated', () {
         setUp(() {
-          when(() => argResults['android-artifact']).thenReturn('aab');
+          when(() => argResults['artifact']).thenReturn('aab');
         });
 
         test('returns expected instructions', () {