wip

shorebirdtech · Dec 10, 2024 · ddfd5e3 · ddfd5e3
1 parent ed1adb4
commit ddfd5e3
Show file tree

Hide file tree

Showing 5 changed files with 1,385 additions and 24 deletions.
diff --git a/packages/shorebird_cli/lib/src/artifact_manager.dart b/packages/shorebird_cli/lib/src/artifact_manager.dart
@@ -264,6 +264,7 @@ class ArtifactManager {
     return archsDirectory.existsSync() ? archsDirectory : null;
   }
 
+  /// The directory containing the compiled macOS .app file, if it exists.
   Directory? getMacOSAppDirectory() {
     final projectRoot = shorebirdEnv.getShorebirdProjectRoot()!;
 
@@ -346,12 +347,6 @@ class ArtifactManager {
         .firstWhereOrNull((directory) => directory.path.endsWith('.app'));
   }
 
-  Directory? getMacosAppDirectory({required Directory parentDirectory}) {
-    return parentDirectory.listSync().whereType<Directory>().firstWhereOrNull(
-          (directory) => directory.path.endsWith('.app'),
-        );
-  }
-
   /// Returns the path to the .ipa file generated by `flutter build ipa`.
   ///
   /// Returns null if:

diff --git a/packages/shorebird_cli/lib/src/commands/patch/macos_patcher.dart b/packages/shorebird_cli/lib/src/commands/patch/macos_patcher.dart
@@ -99,10 +99,10 @@ class MacosPatcher extends Patcher {
       ).wait;
 
       if ((flutterVersion ?? minimumSupportedMacosFlutterVersion) <
-          minimumSupportedIosFlutterVersion) {
+          minimumSupportedMacosFlutterVersion) {
         logger.err(
           '''
-macos patches are not supported with Flutter versions older than $minimumSupportedIosFlutterVersion.
+macOS patches are not supported with Flutter versions older than $minimumSupportedMacosFlutterVersion.
 For more information see: ${supportedFlutterVersionsUrl.toLink()}''',
         );
         throw ProcessExit(ExitCode.software.code);
@@ -128,7 +128,7 @@ For more information see: ${supportedFlutterVersionsUrl.toLink()}''',
         buildProgress.fail('Failed to build: ${error.message}');
         rethrow;
       } on ArtifactBuildException catch (error) {
-        buildProgress.fail('Failed to build macos app');
+        buildProgress.fail('Failed to build macOS app');
         logger.err(error.message);
         rethrow;
       }
@@ -282,7 +282,7 @@ For more information see: ${supportedFlutterVersionsUrl.toLink()}''',
     if (useLinker && await aotTools.isGeneratePatchDiffBaseSupported()) {
       final patchBaseProgress = logger.progress('Generating patch diff base');
       final analyzeSnapshotPath = shorebirdArtifacts.getArtifactPath(
-        artifact: ShorebirdArtifact.analyzeSnapshotMacos,
+        artifact: ShorebirdArtifact.analyzeSnapshotMacOS,
       );
 
       final File patchBaseFile;
@@ -369,7 +369,7 @@ For more information see: ${supportedFlutterVersionsUrl.toLink()}''',
 
     final analyzeSnapshot = File(
       shorebirdArtifacts.getArtifactPath(
-        artifact: ShorebirdArtifact.analyzeSnapshotMacos,
+        artifact: ShorebirdArtifact.analyzeSnapshotMacOS,
       ),
     );
 

diff --git a/packages/shorebird_cli/lib/src/commands/release/macos_releaser.dart b/packages/shorebird_cli/lib/src/commands/release/macos_releaser.dart
@@ -109,7 +109,7 @@ For more information see: ${supportedFlutterVersionsUrl.toLink()}''',
     // This is to ensure that we don't accidentally upload stale artifacts
     // when building with older versions of Flutter.
     final shorebirdSupplementDir =
-        artifactManager.getIosReleaseSupplementDirectory();
+        artifactManager.getMacosReleaseSupplementDirectory();
     if (shorebirdSupplementDir?.existsSync() ?? false) {
       shorebirdSupplementDir!.deleteSync(recursive: true);
     }

diff --git a/packages/shorebird_cli/lib/src/shorebird_artifacts.dart b/packages/shorebird_cli/lib/src/shorebird_artifacts.dart
@@ -14,7 +14,7 @@ enum ShorebirdArtifact {
   analyzeSnapshotIos,
 
   /// The macOS analyze_snapshot executable.
-  analyzeSnapshotMacos,
+  analyzeSnapshotMacOS,
 
   /// The aot_tools executable or kernel file.
   aotTools,
@@ -56,7 +56,7 @@ class ShorebirdCachedArtifacts implements ShorebirdArtifacts {
     switch (artifact) {
       case ShorebirdArtifact.analyzeSnapshotIos:
         return _analyzeSnapshotIosFile.path;
-      case ShorebirdArtifact.analyzeSnapshotMacos:
+      case ShorebirdArtifact.analyzeSnapshotMacOS:
         return _analyzeSnapshotMacosFile.path;
       case ShorebirdArtifact.aotTools:
         return _aotToolsFile.path;
@@ -159,24 +159,37 @@ class ShorebirdLocalEngineArtifacts implements ShorebirdArtifacts {
   String getArtifactPath({required ShorebirdArtifact artifact}) {
     switch (artifact) {
       case ShorebirdArtifact.analyzeSnapshotIos:
-      case ShorebirdArtifact.analyzeSnapshotMacos:
-        return _analyzeSnapshotFile.path;
+        return _analyzeSnapshotIosFile.path;
+      case ShorebirdArtifact.analyzeSnapshotMacOS:
+        return _analyzeSnapshotMacosFile.path;
       case ShorebirdArtifact.aotTools:
         return _aotToolsFile.path;
       case ShorebirdArtifact.genSnapshotIos:
+        return _genSnapshotIosFile.path;
       case ShorebirdArtifact.genSnapshotMacOS:
-        return _genSnapshotFile.path;
+        return _genSnapshotMacosFile.path;
     }
   }
 
-  File get _analyzeSnapshotFile {
+  File get _analyzeSnapshotIosFile {
+    return File(
+      p.join(
+        engineConfig.localEngineSrcPath!,
+        'out',
+        engineConfig.localEngine,
+        'clang_x64',
+        'analyze_snapshot_arm64',
+      ),
+    );
+  }
+
+  File get _analyzeSnapshotMacosFile {
     return File(
       p.join(
         engineConfig.localEngineSrcPath!,
         'out',
         engineConfig.localEngine,
         'clang_x64',
-        // 'analyze_snapshot_arm64',
         'analyze_snapshot',
       ),
     );
@@ -197,14 +210,25 @@ class ShorebirdLocalEngineArtifacts implements ShorebirdArtifacts {
     );
   }
 
-  File get _genSnapshotFile {
+  File get _genSnapshotIosFile {
+    return File(
+      p.join(
+        engineConfig.localEngineSrcPath!,
+        'out',
+        engineConfig.localEngine,
+        'clang_x64',
+        'gen_snapshot_arm64',
+      ),
+    );
+  }
+
+  File get _genSnapshotMacosFile {
     return File(
       p.join(
         engineConfig.localEngineSrcPath!,
         'out',
         engineConfig.localEngine,
         'clang_x64',
-        // 'gen_snapshot_arm64',
         'gen_snapshot',
       ),
     );