feat: support flavors on macOS

shorebirdtech · Jan 17, 2025 · caed3ba · caed3ba
1 parent 93c56fb
commit caed3ba
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/packages/shorebird_cli/lib/src/artifact_manager.dart b/packages/shorebird_cli/lib/src/artifact_manager.dart
@@ -265,7 +265,7 @@ class ArtifactManager {
   }
 
   /// The directory containing the compiled macOS .app file, if it exists.
-  Directory? getMacOSAppDirectory() {
+  Directory? getMacOSAppDirectory({String? flavor}) {
     final projectRoot = shorebirdEnv.getShorebirdProjectRoot()!;
 
     final appDirectory = Directory(
@@ -275,7 +275,7 @@ class ArtifactManager {
         'macos',
         'Build',
         'Products',
-        'Release',
+        flavor != null ? 'Release-$flavor' : 'Release',
       ),
     );
 

diff --git a/packages/shorebird_cli/lib/src/commands/patch/macos_patcher.dart b/packages/shorebird_cli/lib/src/commands/patch/macos_patcher.dart
@@ -232,7 +232,7 @@ For more information see: ${supportedFlutterVersionsUrl.toLink()}''',
       throw ProcessExit(ExitCode.software.code);
     }
 
-    final appPath = artifactManager.getMacOSAppDirectory()!.path;
+    final appPath = artifactManager.getMacOSAppDirectory(flavor: flavor)!.path;
     final tempDir = await Directory.systemTemp.createTemp();
     final zippedApp = File(p.join(tempDir.path, '${p.basename(appPath)}.zip'));
     await ditto.archive(
@@ -258,7 +258,7 @@ For more information see: ${supportedFlutterVersionsUrl.toLink()}''',
     }
 
     // Verify that we have built a patch .app
-    if (artifactManager.getMacOSAppDirectory()?.path == null) {
+    if (artifactManager.getMacOSAppDirectory(flavor: flavor)?.path == null) {
       logger.err('Unable to find .app directory');
       throw ProcessExit(ExitCode.software.code);
     }

diff --git a/packages/shorebird_cli/lib/src/commands/release/macos_releaser.dart b/packages/shorebird_cli/lib/src/commands/release/macos_releaser.dart
@@ -125,7 +125,7 @@ For more information see: ${supportedFlutterVersionsUrl.toLink()}''',
       throw ProcessExit(ExitCode.software.code);
     }
 
-    final appDirectory = artifactManager.getMacOSAppDirectory();
+    final appDirectory = artifactManager.getMacOSAppDirectory(flavor: flavor);
     if (appDirectory == null) {
       logger.err('Unable to find .app directory');
       throw ProcessExit(ExitCode.software.code);
@@ -161,7 +161,7 @@ For more information see: ${supportedFlutterVersionsUrl.toLink()}''',
     required Release release,
     required String appId,
   }) async {
-    final appDirectory = artifactManager.getMacOSAppDirectory();
+    final appDirectory = artifactManager.getMacOSAppDirectory(flavor: flavor);
     if (appDirectory == null) {
       logger.err('Unable to find .app directory');
       throw ProcessExit(ExitCode.software.code);
@@ -204,6 +204,6 @@ For more information see: ${supportedFlutterVersionsUrl.toLink()}''',
   @override
   String get postReleaseInstructions => '''
 
-macOS app created at ${artifactManager.getMacOSAppDirectory()!.path}.
+macOS app created at ${artifactManager.getMacOSAppDirectory(flavor: flavor)!.path}.
 ''';
 }