flutter322: remove

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

diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh

index 75d9d3013e..657ad3cb78 100644

--- a/bin/internal/shared.sh

+++ b/bin/internal/shared.sh

@@ -245,7 +245,7 @@ function shared::execute() {

   # and will corrupt each others' downloads.

   #

   # SHARED_NAME itself is prepared by the caller script.

-  upgrade_flutter 7< "$SHARED_NAME"

+  # upgrade_flutter 7< "$SHARED_NAME"

   BIN_NAME="$(basename "$PROG_NAME")"

   case "$BIN_NAME" in

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) {

This patch introduces an intermediate Gradle build step to alter the behavior

of flutter_tools' Gradle project, specifically moving the creation of `build`

and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`.

Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle`

directories within the Nix Store. Resulting in read-only errors when trying to build a

Flutter Android app at runtime.

This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project

when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")`

`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory.

The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` and `includeBuild`s it.

This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting

`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`.

Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, but `build` doesn't.

To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` as well, we need to set `buildDirectory`.

diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle

new file mode 100644

index 0000000000..b2485c94b4

--- /dev/null

+++ b/packages/flutter_tools/gradle/settings.gradle

@@ -0,0 +1,19 @@

+rootProject.buildFileName = "/dev/null"

+

+def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10)

+def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev")

+dir.mkdirs()

+def file = new File(dir, "settings.gradle")

+

+file.text = """

+rootProject.projectDir = new File("$settingsDir")

+apply from: new File("$settingsDir/settings.gradle.kts")

+

+gradle.allprojects { project ->

+  project.beforeEvaluate {

+    project.layout.buildDirectory = new File("$dir/build")

+  }

+}

+"""

+

+includeBuild(dir)