Unverified Commit a2b56cd6 authored by Tristan Ross's avatar Tristan Ross
Browse files

flutterPackages.v3_24: fix patches

parent 92c116b4

pkgs/development/compilers/flutter/patches/deregister-pub-dependencies-artifact.patch→pkgs/development/compilers/flutter/versions/3_13/patches/deregister-pub-dependencies-artifact.patch

+0 −0

File moved.

View file

pkgs/development/compilers/flutter/versions/3_16/patches/deregister-pub-dependencies-artifact.patch

0 → 100644
+19 −0
Original line number Diff line number Diff line 
diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart

index 252021cf78..e50ef0885d 100644

--- a/packages/flutter_tools/lib/src/flutter_cache.dart

+++ b/packages/flutter_tools/lib/src/flutter_cache.dart

@@ -51,14 +51,6 @@ class FlutterCache extends Cache {

       registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform));

     }

     registerArtifact(FontSubsetArtifacts(this, platform: platform));

-    registerArtifact(PubDependencies(

-      logger: logger,

-      // flutter root and pub must be lazily initialized to avoid accessing

-      // before the version is determined.

-      flutterRoot: () => Cache.flutterRoot!,

-      pub: () => pub,

-      projectFactory: projectFactory,

-    ));

   }

 }

 
 No newline at end of file

pkgs/development/compilers/flutter/versions/3_16/patches/disable-auto-update.patch

0 → 100644
+37 −0
Original line number Diff line number Diff line 
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart

index b7e624b4e2..edfdde118b 100644

--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart

+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart

@@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and

 

     // Populate the cache. We call this before pub get below so that the

     // sky_engine package is available in the flutter cache for pub to find.

-    if (shouldUpdateCache) {

+    if (false) {

       // First always update universal artifacts, as some of these (e.g.

       // ios-deploy on macOS) are required to determine `requiredArtifacts`.

       final bool offline;

diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart

index 5d6d78639f..90a4dfa555 100644

--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart

+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart

@@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> {

           globals.flutterUsage.suppressAnalytics = true;

         }

 

-        globals.flutterVersion.ensureVersionFile();

         final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false;

         final bool ci = await globals.botDetector.isRunningOnBot;

         final bool redirectedCompletion = !globals.stdio.hasTerminal &&

@@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> {

         final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false;

         final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag;

 

-        if (topLevelResults.command?.name != 'upgrade' &&

-            (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) {

-          await globals.flutterVersion.checkFlutterVersionFreshness();

-        }

-

         // See if the user specified a specific device.

         final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?;

         if (specifiedDeviceId != null) {

pkgs/development/compilers/flutter/versions/3_19/patches/deregister-pub-dependencies-artifact.patch

0 → 100644
+19 −0
Original line number Diff line number Diff line 
diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart

index 252021cf78..e50ef0885d 100644

--- a/packages/flutter_tools/lib/src/flutter_cache.dart

+++ b/packages/flutter_tools/lib/src/flutter_cache.dart

@@ -51,14 +51,6 @@ class FlutterCache extends Cache {

       registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform));

     }

     registerArtifact(FontSubsetArtifacts(this, platform: platform));

-    registerArtifact(PubDependencies(

-      logger: logger,

-      // flutter root and pub must be lazily initialized to avoid accessing

-      // before the version is determined.

-      flutterRoot: () => Cache.flutterRoot!,

-      pub: () => pub,

-      projectFactory: projectFactory,

-    ));

   }

 }

 
 No newline at end of file