Unverified Commit d91608b0 authored by Maciej Krüger's avatar Maciej Krüger Committed by GitHub
Browse files

flutter332: init at 3.32.0-0.3.pre (#401583)

parents df710512 3781a682
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -78,6 +78,10 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}"
      mkdir "$FLUTTER_ROOT/bin/cache/dart-sdk"
      lndir -silent '${flutter'}/bin/cache/dart-sdk' "$FLUTTER_ROOT/bin/cache/dart-sdk"
    ''
    # Could not determine engine revision
    + lib.optionalString (lib.versionAtLeast flutter'.version "3.32") ''
      cp '${flutter'}/bin/internal/engine.version' "$FLUTTER_ROOT/bin/cache/engine.stamp"
    ''
    + ''

      HOME="$(mktemp -d)" flutter precache ${
+22 −6
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@
  dart,
  lib,
  stdenv,
  runCommand,
}:
let
  mkCustomFlutter = args: callPackage ./flutter.nix args;
@@ -69,12 +70,27 @@ let
            };
          };
        };
        src = fetchFromGitHub {
        src =
          let
            source = fetchFromGitHub {
              owner = "flutter";
              repo = "flutter";
              rev = version;
              hash = flutterHash;
            };
          in
          (
            if lib.versionAtLeast version "3.32" then
              # # Could not determine engine revision
              (runCommand source.name { } ''
                cp -r ${source} $out
                chmod +w $out/bin
                mkdir $out/bin/cache
                cp $out/bin/internal/engine.version $out/bin/cache/engine.stamp
              '')
            else
              source
          );
      };
    in
    (mkCustomFlutter args).overrideAttrs (
+1040 −0

File added.

Preview size limit exceeded, changes collapsed.

+21 −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 df67547..eacc7c4 100644
--- a/packages/flutter_tools/lib/src/flutter_cache.dart
+++ b/packages/flutter_tools/lib/src/flutter_cache.dart
@@ -51,16 +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,
-      ),
-    );
   }
 }
 
+30 −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 e4e474ab6e..5548599802 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart
@@ -1693,7 +1693,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 a1104da..1749d65 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
@@ -444,12 +444,8 @@ class FlutterCommandRunner extends CommandRunner<void> {
           globals.analytics.suppressTelemetry();
         }
 
-        globals.flutterVersion.ensureVersionFile();
         final bool machineFlag =
             topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false;
-        if (await _shouldCheckForUpdates(topLevelResults, topLevelMachineFlag: machineFlag)) {
-          await globals.flutterVersion.checkFlutterVersionFreshness();
-        }
 
         // See if the user specified a specific device.
         final String? specifiedDeviceId =
Loading