From ef6d36f6f88491a9968f648c7540c602f6ecfb8d Mon Sep 17 00:00:00 2001
From: Felix Angelov <felix@shorebird.dev>
Date: Sat, 5 Aug 2023 18:12:48 -0500
Subject: [PATCH] fix(shorebird_cli): `--split-per-abi` incorrectly always
 enabled (#1042)

---
 .../shorebird_cli/lib/src/shorebird_build_mixin.dart   |  4 ++--
 .../commands/release/release_android_command_test.dart | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/shorebird_cli/lib/src/shorebird_build_mixin.dart b/packages/shorebird_cli/lib/src/shorebird_build_mixin.dart
index 3b627b9b..125bbe05 100644
--- a/packages/shorebird_cli/lib/src/shorebird_build_mixin.dart
+++ b/packages/shorebird_cli/lib/src/shorebird_build_mixin.dart
@@ -138,7 +138,7 @@ mixin ShorebirdBuildMixin on ShorebirdCommand {
   Future<void> buildApk({
     String? flavor,
     String? target,
-    bool? splitPerAbi,
+    bool splitPerAbi = false,
   }) async {
     const executable = 'flutter';
     final arguments = [
@@ -147,7 +147,7 @@ mixin ShorebirdBuildMixin on ShorebirdCommand {
       '--release',
       if (flavor != null) '--flavor=$flavor',
       if (target != null) '--target=$target',
-      if (splitPerAbi != null) '--split-per-abi',
+      if (splitPerAbi) '--split-per-abi',
       ...results.rest,
     ];
 
diff --git a/packages/shorebird_cli/test/src/commands/release/release_android_command_test.dart b/packages/shorebird_cli/test/src/commands/release/release_android_command_test.dart
index e430fe5c..88174793 100644
--- a/packages/shorebird_cli/test/src/commands/release/release_android_command_test.dart
+++ b/packages/shorebird_cli/test/src/commands/release/release_android_command_test.dart
@@ -375,6 +375,14 @@ void main() {
           status: ReleaseStatus.active,
         ),
       ).called(1);
+      const buildApkArguments = ['build', 'apk', '--release'];
+      verify(
+        () => shorebirdProcess.run(
+          'flutter',
+          buildApkArguments,
+          runInShell: true,
+        ),
+      ).called(1);
       expect(exitCode, ExitCode.success.code);
     });
 
@@ -401,7 +409,7 @@ void main() {
           status: ReleaseStatus.active,
         ),
       ).called(1);
-      final buildApkArguments = [
+      const buildApkArguments = [
         'build',
         'apk',
         '--release',