Merge branch 'main' of github.com:flutter/packages into nested-persistent-navigation

# Conflicts:
#	packages/go_router/CHANGELOG.md
#	packages/go_router/lib/src/delegate.dart
#	packages/go_router/lib/src/parser.dart
#	packages/go_router/pubspec.yaml

Author: tolo

.ci/flutter_master.version

@@ -1 +1 @@
-12b36de8f7ac82a6b2b68ee627fe6c1b4c705cc5
+a086c640dcc4362879089d93ad16ce5765c06f62

.ci/flutter_stable.version

@@ -1 +1 @@
-90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
+4b12645012342076800eb701bcdfe18f87da21cf

.cirrus.yml

@@ -324,8 +324,8 @@ task:
     - name: web_benchmarks_test
       env:
         matrix:
-          CHROMIUM_BUILD: "768968" # Chromium 84.0.4147.0
           CHROMIUM_BUILD: "950363" # Chromium 98.0.4758.0
+          CHROMIUM_BUILD: "1097615" # Chromium 111
       << : *INSTALL_CHROME_LINUX
       script:
         - cd packages/web_benchmarks/testing/test_app

AUTHORS

@@ -71,3 +71,4 @@ TheOneWithTheBraid <[email protected]>
 Rulong Chen（陈汝龙） <[email protected]>
 Hwanseok Kang <[email protected]>
 Twin Sun, LLC <[email protected]>
+Amir Panahandeh <[email protected]>

README.md

@@ -32,14 +32,11 @@ android {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
-    lintOptions {
-        disable 'InvalidPackage'
-    }
 
     defaultConfig {
         applicationId "dev.flutter.packages.animations.example"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 32
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -52,6 +49,10 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    namespace 'dev.flutter.packages.animations.example'
+    lint {
+        disable 'InvalidPackage'
+    }
 }
 
 flutter {

packages/animations/example/android/app/build.gradle

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.flutter.packages.animations.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

packages/animations/example/android/app/src/debug/AndroidManifest.xml

@@ -1,12 +1,12 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.flutter.packages.animations.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
         android:label="example"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">

packages/animations/example/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.flutter.packages.animations.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

packages/animations/example/android/app/src/profile/AndroidManifest.xml

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.0'
+    ext.kotlin_version = '1.6.21'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }