chore: Revert "feat(shorebird_cli): Add support for updater_tools" (#…

…2129)
shorebirdtech · May 20, 2024 · c24adec · c24adec
1 parent 1d64dcb
commit c24adec
Show file tree

Hide file tree

Showing 24 changed files with 141 additions and 562 deletions.
diff --git a/packages/artifact_proxy/pubspec.lock b/packages/artifact_proxy/pubspec.lock
@@ -578,4 +578,4 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.4.0 <4.0.0"
+  dart: ">=3.4.0-256.0.dev <4.0.0"
diff --git a/packages/discord_gcp_alerts/pubspec.lock b/packages/discord_gcp_alerts/pubspec.lock
@@ -570,4 +570,4 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.4.0 <4.0.0"
+  dart: ">=3.4.0-256.0.dev <4.0.0"
diff --git a/packages/shorebird_cli/bin/shorebird.dart b/packages/shorebird_cli/bin/shorebird.dart
@@ -66,7 +66,6 @@ Future<void> main(List<String> args) async {
         shorebirdToolsRef,
         shorebirdValidatorRef,
         shorebirdVersionRef,
-        updaterToolsRef,
         xcodeBuildRef,
       },
     ),

diff --git a/packages/shorebird_cli/lib/src/artifact_manager.dart b/packages/shorebird_cli/lib/src/artifact_manager.dart
@@ -21,41 +21,33 @@ class ArtifactManager {
   /// Generates a binary diff between two files and returns the path to the
   /// output diff file.
   Future<String> createDiff({
-    required File releaseArtifact,
-    required File patchArtifact,
+    required String releaseArtifactPath,
+    required String patchArtifactPath,
   }) async {
-    if (!releaseArtifact.existsSync()) {
+    if (!File(releaseArtifactPath).existsSync()) {
       throw FileSystemException(
         'Release artifact does not exist',
-        releaseArtifact.path,
+        releaseArtifactPath,
       );
     }
 
-    if (!patchArtifact.existsSync()) {
+    if (!File(patchArtifactPath).existsSync()) {
       throw FileSystemException(
         'Patch artifact does not exist',
-        patchArtifact.path,
+        patchArtifactPath,
       );
     }
 
     final tempDir = await Directory.systemTemp.createTemp();
-    final outputFile = File(p.join(tempDir.path, 'diff.patch'));
-    final updaterToolsFile = File(updaterTools.path);
-    if (updaterToolsFile.existsSync()) {
-      await updaterTools.createDiff(
-        releaseArtifact: releaseArtifact,
-        patchArtifact: patchArtifact,
-        outputFile: outputFile,
-      );
-    } else {
-      await patchExecutable.run(
-        releaseArtifactPath: releaseArtifact.path,
-        patchArtifactPath: patchArtifact.path,
-        diffPath: outputFile.path,
-      );
-    }
+    final diffPath = p.join(tempDir.path, 'diff.patch');
+
+    await patchExecutable.run(
+      releaseArtifactPath: releaseArtifactPath,
+      patchArtifactPath: patchArtifactPath,
+      diffPath: diffPath,
+    );
 
-    return outputFile.path;
+    return diffPath;
   }
 
   /// Downloads the file at the given [uri] to a temporary directory and returns

diff --git a/packages/shorebird_cli/lib/src/cache.dart b/packages/shorebird_cli/lib/src/cache.dart
@@ -47,7 +47,6 @@ class Cache {
     registerArtifact(BundleToolArtifact(cache: this, platform: platform));
     registerArtifact(AotToolsDillArtifact(cache: this, platform: platform));
     registerArtifact(AotToolsExeArtifact(cache: this, platform: platform));
-    registerArtifact(UpdaterToolsArtifact(cache: this, platform: platform));
   }
 
   void registerArtifact(CachedArtifact artifact) => _artifacts.add(artifact);
@@ -298,34 +297,3 @@ class BundleToolArtifact extends CachedArtifact {
     return 'https://github.com/google/bundletool/releases/download/1.15.6/bundletool-all-1.15.6.jar';
   }
 }
-
-/// {@template updater_tools_artifact}
-/// Tools used to package patch artifacts for use by the Updater.
-/// {@endtemplate}
-class UpdaterToolsArtifact extends CachedArtifact {
-  /// {@macro updater_tools_artifact}
-  UpdaterToolsArtifact({required super.cache, required super.platform});
-
-  @override
-  String get name => 'updater-tools.dill';
-
-  @override
-  bool get isExecutable => false;
-
-  /// Updater tools was introduced in release 1.1.7.
-  // TODO(bryanoltman): add engine rev and flutter version once this is nailed down
-  @override
-  bool get required => false;
-
-  @override
-  Directory get location => Directory(
-        p.join(
-          cache.getArtifactDirectory(name).path,
-          shorebirdEnv.shorebirdEngineRevision,
-        ),
-      );
-
-  @override
-  String get storageUrl =>
-      '${cache.storageBaseUrl}/${cache.storageBucket}/shorebird/${shorebirdEnv.shorebirdEngineRevision}/$name';
-}
diff --git a/packages/shorebird_cli/lib/src/commands/patch/aar_patcher.dart b/packages/shorebird_cli/lib/src/commands/patch/aar_patcher.dart
@@ -141,8 +141,8 @@ class AarPatcher extends Patcher {
       final hash = sha256.convert(await patchArtifact.readAsBytes()).toString();
       try {
         final diffPath = await artifactManager.createDiff(
-          releaseArtifact: File(releaseArtifactPath.value),
-          patchArtifact: patchArtifact,
+          releaseArtifactPath: releaseArtifactPath.value,
+          patchArtifactPath: artifactPath,
         );
         patchArtifactBundles[arch] = PatchArtifactBundle(
           arch: arch.arch,

diff --git a/packages/shorebird_cli/lib/src/commands/patch/android_patcher.dart b/packages/shorebird_cli/lib/src/commands/patch/android_patcher.dart
@@ -150,8 +150,8 @@ Looked in:
       final hash = sha256.convert(await patchArtifact.readAsBytes()).toString();
       try {
         final diffPath = await artifactManager.createDiff(
-          releaseArtifact: File(releaseArtifactPath.value),
-          patchArtifact: patchArtifact,
+          releaseArtifactPath: releaseArtifactPath.value,
+          patchArtifactPath: patchArtifactPath,
         );
         patchArtifactBundles[releaseArtifactPath.key] = PatchArtifactBundle(
           arch: arch.arch,

diff --git a/packages/shorebird_cli/lib/src/commands/patch/ios_framework_patcher.dart b/packages/shorebird_cli/lib/src/commands/patch/ios_framework_patcher.dart
@@ -180,8 +180,8 @@ class IosFrameworkPatcher extends Patcher {
 
       patchFile = File(
         await artifactManager.createDiff(
-          releaseArtifact: patchBaseFile,
-          patchArtifact: patchBuildFile,
+          releaseArtifactPath: patchBaseFile.path,
+          patchArtifactPath: patchBuildFile.path,
         ),
       );
     } else {

diff --git a/packages/shorebird_cli/lib/src/commands/patch/ios_patcher.dart b/packages/shorebird_cli/lib/src/commands/patch/ios_patcher.dart
@@ -201,8 +201,8 @@ class IosPatcher extends Patcher {
 
       patchFile = File(
         await artifactManager.createDiff(
-          releaseArtifact: patchBaseFile,
-          patchArtifact: patchBuildFile,
+          releaseArtifactPath: patchBaseFile.path,
+          patchArtifactPath: patchBuildFile.path,
         ),
       );
     } else {

diff --git a/packages/shorebird_cli/lib/src/executables/aot_tools.dart b/packages/shorebird_cli/lib/src/executables/aot_tools.dart
@@ -169,7 +169,7 @@ class AotTools {
       workingDirectory: workingDirectory,
     );
 
-    if (result.exitCode != ExitCode.success.code) {
+    if (result.exitCode != 0) {
       throw Exception('Failed to link: ${result.stderr}');
     }
 

diff --git a/packages/shorebird_cli/lib/src/executables/executables.dart b/packages/shorebird_cli/lib/src/executables/executables.dart
@@ -9,5 +9,4 @@ export 'ios_deploy.dart';
 export 'java.dart';
 export 'patch_executable.dart';
 export 'shorebird_tools.dart';
-export 'updater_tools.dart';
 export 'xcodebuild.dart';
diff --git a/packages/shorebird_cli/lib/src/executables/patch_executable.dart b/packages/shorebird_cli/lib/src/executables/patch_executable.dart
@@ -29,24 +29,22 @@ class PatchFailedException implements Exception {
 ///
 /// Throws [PatchFailedException] if the patch command exits with non-zero code.
 class PatchExecutable {
-  /// The path to the `patch` executable.
-  String get path => p.join(
-        cache.getArtifactDirectory('patch').path,
-        'patch',
-      );
-
   Future<void> run({
     required String releaseArtifactPath,
     required String patchArtifactPath,
     required String diffPath,
   }) async {
+    final diffExecutable = p.join(
+      cache.getArtifactDirectory('patch').path,
+      'patch',
+    );
     final diffArguments = [
       releaseArtifactPath,
       patchArtifactPath,
       diffPath,
     ];
 
-    final result = await process.run(path, diffArguments);
+    final result = await process.run(diffExecutable, diffArguments);
 
     if (result.exitCode != ExitCode.success.code) {
       throw PatchFailedException(

diff --git a/packages/shorebird_cli/lib/src/executables/updater_tools.dart b/packages/shorebird_cli/lib/src/executables/updater_tools.dart
diff --git a/packages/shorebird_cli/lib/src/shorebird_artifacts.dart b/packages/shorebird_cli/lib/src/shorebird_artifacts.dart
@@ -18,9 +18,6 @@ enum ShorebirdArtifact {
 
   /// The gen_snapshot executable.
   genSnapshot,
-
-  /// The updater_tools kernel file.
-  updaterTools,
 }
 
 /// A reference to a [ShorebirdArtifacts] instance.
@@ -57,8 +54,6 @@ class ShorebirdCachedArtifacts implements ShorebirdArtifacts {
         return _aotToolsFile.path;
       case ShorebirdArtifact.genSnapshot:
         return _genSnapshotFile.path;
-      case ShorebirdArtifact.updaterTools:
-        return _updaterToolsFile.path;
     }
   }
 
@@ -113,16 +108,6 @@ class ShorebirdCachedArtifacts implements ShorebirdArtifacts {
       ),
     );
   }
-
-  File get _updaterToolsFile {
-    return File(
-      p.join(
-        cache.getArtifactDirectory('updater-tools').path,
-        shorebirdEnv.shorebirdEngineRevision,
-        'updater-tools.dill',
-      ),
-    );
-  }
 }
 
 /// {@template shorebird_local_engine_artifacts}
@@ -141,8 +126,6 @@ class ShorebirdLocalEngineArtifacts implements ShorebirdArtifacts {
         return _aotToolsFile.path;
       case ShorebirdArtifact.genSnapshot:
         return _genSnapshotFile.path;
-      case ShorebirdArtifact.updaterTools:
-        return _updaterToolsFile.path;
     }
   }
 
@@ -183,17 +166,4 @@ class ShorebirdLocalEngineArtifacts implements ShorebirdArtifacts {
       ),
     );
   }
-
-  File get _updaterToolsFile {
-    return File(
-      p.join(
-        engineConfig.localEngineSrcPath!,
-        'third_party',
-        'updater',
-        'updater_tools',
-        'bin',
-        'updater_tools.dart',
-      ),
-    );
-  }
 }
diff --git a/packages/shorebird_cli/pubspec.lock b/packages/shorebird_cli/pubspec.lock
@@ -561,10 +561,10 @@ packages:
     dependency: "direct main"
     description:
       name: scoped_deps
-      sha256: bc54cece4fed785157dc53b7554d31107f574897f4b2d1196db905a38c084e31
+      sha256: "7416a9026f3b457dda634a8e83c8e47d7ece33bef360ffba114c2d89255166ae"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.0+2"
+    version: "0.1.0+1"
   shelf:
     dependency: transitive
     description: