Merge branch 'main' into webview_patchedv5

* main: (104 commits)
  [various] Remove unnecessary null checks (flutter#4060)
  [ci] Add a legacy Android build-all test (flutter#4005)
  Roll Flutter from ab57304 to 3437189 (5 revisions) (flutter#4062)
  [go_router] Nested stateful navigation with ShellRoute (flutter#2650)
  [go_router] Nested stateful navigation with ShellRoute (flutter#2650)
  [go_router] Nested stateful navigation with ShellRoute (flutter#2650)
  [in_app_purchases] Fix mismatching method signature strings (flutter#4040)
  [go_router] Nested stateful navigation with ShellRoute (flutter#2650)
  [go_router] Nested stateful navigation with ShellRoute (flutter#2650)
  [go_router] Nested stateful navigation with ShellRoute (flutter#2650)
  Roll Flutter from 077d644 to ab57304 (18 revisions) (flutter#4051)
  Roll Flutter from 5ae6438 to 077d644 (23 revisions) (flutter#4043)
  [local_auth] Migrate iOS to Pigeon (flutter#3974)
  [go_router] fix context extension for replaceNamed (flutter#3927)
  [image_picker] Fix crash due to `SecurityException` (flutter#4004)
  Roll Flutter from d0d1feb to 5ae6438 (42 revisions) (flutter#4038)
  [ci] Lower iOS LUCI timeouts (flutter#4035)
  [ci] Increase Android sharding (flutter#4029)
  [flutter_plugin_android_lifecycle] Fix lints (flutter#4030)
  [rfw] Fix a typo in the API documentation (flutter#4023)
  ...

.ci.yaml

@@ -24,27 +24,37 @@ platform_properties:
     properties:
       dependencies: >-
         [
-          {"dependency": "xcode", "version": "14c18"},
+          {"dependency": "xcode", "version": "14e222b"},
           {"dependency": "gems", "version": "v3.3.14"}
         ]
       os: Mac-12
       device_type: none
       cpu: arm64
-      xcode: 14c18
+      xcode: 14e222b
   mac_x64:
     properties:
       dependencies: >-
         [
-          {"dependency": "xcode", "version": "14c18"},
+          {"dependency": "xcode", "version": "14e222b"},
           {"dependency": "gems", "version": "v3.3.14"}
         ]
       os: Mac-12
       device_type: none
       cpu: x86
-      xcode: 14c18
+      xcode: 14e222b
 
 targets:
-  ### iOS+macOS tasks ***
+  ### Linux tasks ###
+  - name: Linux repo_tools_tests
+    recipe: packages/packages
+    timeout: 30
+    properties:
+      add_recipes_cq: "true"
+      target_file: repo_tools_tests.yaml
+      channel: master
+      version_file: flutter_master.version
+
+  ### iOS+macOS tasks ###
   # TODO(stuartmorgan): Move this to ARM once google_maps_flutter has ARM
   # support. `pod lint` makes a synthetic target that doesn't respect the
   # pod's arch exclusions, so fails to build.
@@ -139,12 +149,9 @@ targets:
       version_file: flutter_stable.version
       target_file: ios_build_all_packages.yaml
 
-  # TODO(stuartmorgan): Change all of the ios_platform_tests_* task timeouts
-  # to 60 minutes once https://github.com/flutter/flutter/issues/119750 is
-  # fixed.
   - name: Mac_arm64 ios_platform_tests_shard_1 master
     recipe: packages/packages
-    timeout: 120
+    timeout: 60
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
@@ -153,7 +160,7 @@ targets:
 
   - name: Mac_arm64 ios_platform_tests_shard_2 master
     recipe: packages/packages
-    timeout: 120
+    timeout: 60
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
@@ -162,7 +169,7 @@ targets:
 
   - name: Mac_arm64 ios_platform_tests_shard_3 master
     recipe: packages/packages
-    timeout: 120
+    timeout: 60
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
@@ -171,7 +178,7 @@ targets:
 
   - name: Mac_arm64 ios_platform_tests_shard_4 master
     recipe: packages/packages
-    timeout: 120
+    timeout: 60
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
@@ -180,7 +187,7 @@ targets:
 
   - name: Mac_arm64 ios_platform_tests_shard_5 master
     recipe: packages/packages
-    timeout: 120
+    timeout: 60
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
@@ -191,7 +198,7 @@ targets:
   - name: Mac_arm64 ios_platform_tests_shard_1 stable
     recipe: packages/packages
     presubmit: false
-    timeout: 120
+    timeout: 60
     properties:
       channel: stable
       add_recipes_cq: "true"
@@ -202,7 +209,7 @@ targets:
   - name: Mac_arm64 ios_platform_tests_shard_2 stable
     recipe: packages/packages
     presubmit: false
-    timeout: 120
+    timeout: 60
     properties:
       channel: stable
       add_recipes_cq: "true"
@@ -213,7 +220,7 @@ targets:
   - name: Mac_arm64 ios_platform_tests_shard_3 stable
     recipe: packages/packages
     presubmit: false
-    timeout: 120
+    timeout: 60
     properties:
       channel: stable
       add_recipes_cq: "true"
@@ -224,7 +231,7 @@ targets:
   - name: Mac_arm64 ios_platform_tests_shard_4 stable
     recipe: packages/packages
     presubmit: false
-    timeout: 120
+    timeout: 60
     properties:
       channel: stable
       add_recipes_cq: "true"
@@ -235,7 +242,7 @@ targets:
   - name: Mac_arm64 ios_platform_tests_shard_5 stable
     recipe: packages/packages
     presubmit: false
-    timeout: 120
+    timeout: 60
     properties:
       channel: stable
       add_recipes_cq: "true"

.ci/Dockerfile

@@ -23,7 +23,7 @@ RUN apt-get install -y clang-format
 # - build tools.
 RUN apt-get install -y clang cmake ninja-build file pkg-config
 # - libraries.
-RUN apt-get install -y libgtk-3-dev libblkid-dev liblzma-dev libgcrypt20-dev
+RUN apt-get install -y libgtk-3-dev
 # - xvfb to allow running headless.
 RUN apt-get install -y xvfb libegl1-mesa
 

.ci/flutter_master.version

@@ -1 +1 @@
-66fa4c5d301c5093cb4403b39e3d61f604b96d90
+343718945bcbcc356dbb8b1c51fcd5655dd5bb87

.ci/flutter_stable.version

@@ -1 +1 @@
-f72efea43c3013323d1b95cff571f3c1caa37583
+d3d8effc686d73e0114d71abdcccef63fa1f25d2

.ci/legacy_project/README.md

@@ -0,0 +1,37 @@
+This directory contains a partial snapshot of an old Flutter project; it is
+intended to replace the corresponding parts of a newly Flutter-created project
+to allow testing plugin builds with a legacy project.
+
+It was originally created with Flutter 2.0.6. In general the guidelines are:
+- Pieces here should be largely self-contained rather than portions of
+  major project components; for instance, it currently contains the entire
+  `android/` directory from a legacy project, rather than a subset of it
+  which would be combined with a subset of a new project's `android/`
+  directory. This is to avoid random breakage in the future due to
+  conflicts between those subsets. For instance, we could probably get
+  away with not including android/app/src/main/res for a while, and
+  instead layer in the versions from a new project, but then someday
+  if the resources were renamed, there would be dangling references to
+  the old resources in files that are included here.
+- Updates over time should be minimal. We don't expect that an unchanged
+  project will keep working forever, but this directory should simulate
+  a developer who has done the bare minimum to keep their project working
+  as they have updated Flutter.
+- Updates should be logged below.
+
+The reason for the hybrid model, rather than checking in a full legacy
+project, is to minimize unnecessary maintenance work. E.g., there's no
+need to manually keep Dart code updated for Flutter changes just to
+test legacy native Android build behaviors.
+
+## Manual changes to files
+
+The following are the changes relative to running:
+
+```bash
+flutter create -a java all_packages
+```
+
+and then deleting everything but `android/` from it:
+
+- Added license boilerplate.

.ci/legacy_project/all_packages/.gitignore

@@ -0,0 +1,46 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+/build/
+
+# Web related
+lib/generated_plugin_registrant.dart
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release

.ci/legacy_project/all_packages/.metadata

@@ -0,0 +1,10 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: 1d9032c7e1d867f071f2277eb1673e8f9b0274e3
+  channel: unknown
+
+project_type: app

.ci/legacy_project/all_packages/android/.gitignore

@@ -0,0 +1,11 @@
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
+/local.properties
+GeneratedPluginRegistrant.java
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+key.properties

.ci/legacy_project/all_packages/android/app/build.gradle

@@ -0,0 +1,47 @@
+def localProperties = new Properties()
+def localPropertiesFile = rootProject.file('local.properties')
+if (localPropertiesFile.exists()) {
+    localPropertiesFile.withReader('UTF-8') { reader ->
+        localProperties.load(reader)
+    }
+}
+
+def flutterRoot = localProperties.getProperty('flutter.sdk')
+if (flutterRoot == null) {
+    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+}
+
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
+apply plugin: 'com.android.application'
+apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+
+android {
+    compileSdkVersion 30
+
+    defaultConfig {
+        applicationId "com.example.all_packages"
+        minSdkVersion 16
+        targetSdkVersion 30
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
+    }
+
+    buildTypes {
+        release {
+            signingConfig signingConfigs.debug
+        }
+    }
+}
+
+flutter {
+    source '../..'
+}

.ci/legacy_project/all_packages/android/app/src/debug/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.all_packages">
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>

.ci/legacy_project/all_packages/android/app/src/main/AndroidManifest.xml

@@ -0,0 +1,41 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.all_packages">
+   <application
+        android:label="all_packages"
+        android:icon="@mipmap/ic_launcher">
+        <activity
+            android:name=".MainActivity"
+            android:launchMode="singleTop"
+            android:theme="@style/LaunchTheme"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
+            android:windowSoftInputMode="adjustResize">
+            <!-- Specifies an Android theme to apply to this Activity as soon as
+                 the Android process has started. This theme is visible to the user
+                 while the Flutter UI initializes. After that, this theme continues
+                 to determine the Window background behind the Flutter UI. -->
+            <meta-data
+              android:name="io.flutter.embedding.android.NormalTheme"
+              android:resource="@style/NormalTheme"
+              />
+            <!-- Displays an Android View that continues showing the launch screen
+                 Drawable until Flutter paints its first frame, then this splash
+                 screen fades out. A splash screen is useful to avoid any visual
+                 gap between the end of Android's launch screen and the painting of
+                 Flutter's first frame. -->
+            <meta-data
+              android:name="io.flutter.embedding.android.SplashScreenDrawable"
+              android:resource="@drawable/launch_background"
+              />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+        <!-- Don't delete the meta-data below.
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
+    </application>
+</manifest>

.ci/legacy_project/all_packages/android/app/src/main/java/com/example/all_packages/MainActivity.java

@@ -0,0 +1,10 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package com.example.all_packages;
+
+import io.flutter.embedding.android.FlutterActivity;
+
+public class MainActivity extends FlutterActivity {
+}

.ci/legacy_project/all_packages/android/app/src/main/res/drawable-v21/launch_background.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?android:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>

.ci/legacy_project/all_packages/android/app/src/main/res/drawable/launch_background.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:color/white" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>