Merge branch upstream/main into feature/expose-payment-request-enabled

Author: mataku

.ci/flutter_master.version

@@ -1 +1 @@
-871849e4b6bfcad29021c826703b1ac8d3e07c0a
+92a6bfbfd6ef6f76c945cbd4facaa138f25c123f

.ci/legacy_project/README.md

@@ -54,3 +54,4 @@ and then deleting everything but `android/` from it:
 - Modifies `settings.gradle` to upgrade the Kotlin Gradle Plugin (KGP)
   from version 1.9.0 to 2.1.0. If a user runs into an error with the AGP version,
   the warning is clear on how to upgrade the version to one that we support.
+- Modifies `gradle.properties` to not set android.enableJetifier=true.

.ci/legacy_project/all_packages/android/gradle.properties

@@ -1,3 +1,2 @@
 org.gradle.jvmargs=-Xmx4G
 android.useAndroidX=true
-android.enableJetifier=true

.ci/targets/macos_repo_checks.yaml

@@ -13,5 +13,5 @@ tasks:
     always: true
   - name: validate iOS and macOS podspecs
     script: .ci/scripts/tool_runner.sh
-    args: ["podspec-check"]
+    args: ["podspec-check", "--exclude=script/configs/exclude_xcode_deprecation.yaml"]
     always: true

CODEOWNERS

@@ -84,22 +84,22 @@ packages/webview_flutter/webview_flutter_android/**           @bparrishMines
 
 # - Darwin
 packages/camera/camera_avfoundation/**                        @hellohuanlin @vashworth
-packages/file_selector/file_selector_ios/**                   @vashworth @cbracken
-packages/file_selector/file_selector_macos/**                 @vashworth @cbracken
-packages/google_maps_flutter/google_maps_flutter_ios/**       @vashworth @cbracken
-packages/google_sign_in/google_sign_in_ios/**                 @LongCatIsLooong @cbracken
+packages/file_selector/file_selector_ios/**                   @vashworth
+packages/file_selector/file_selector_macos/**                 @vashworth
+packages/google_maps_flutter/google_maps_flutter_ios/**       @vashworth
+packages/google_sign_in/google_sign_in_ios/**                 @LongCatIsLooong
 packages/image_picker/image_picker_ios/**                     @vashworth @louisehsu
 packages/image_picker/image_picker_macos/**                   @vashworth @louisehsu
 packages/in_app_purchase/in_app_purchase_storekit/**          @louisehsu @LongCatIsLooong
-packages/local_auth/local_auth_darwin/**                      @cbracken @vashworth
-packages/path_provider/path_provider_foundation/**            @cbracken @vashworth
+packages/local_auth/local_auth_darwin/**                      @vashworth
+packages/path_provider/path_provider_foundation/**            @vashworth
 packages/pointer_interceptor/pointer_interceptor_ios/**       @louisehsu @hellohuanlin
 packages/quick_actions/quick_actions_ios/**                   @LongCatIsLooong @hellohuanlin
 packages/shared_preferences/shared_preferences_foundation/**  @tarrinneal
 packages/url_launcher/url_launcher_ios/**                     @hellohuanlin @LongCatIsLooong
 packages/url_launcher/url_launcher_macos/**                   @hellohuanlin @LongCatIsLooong
 packages/video_player/video_player_avfoundation/**            @LongCatIsLooong @hellohuanlin
-packages/webview_flutter/webview_flutter_wkwebview/**         @cbracken @louisehsu
+packages/webview_flutter/webview_flutter_wkwebview/**         @louisehsu
 
 # - Linux
 packages/file_selector/file_selector_linux/**                 @stuartmorgan-g

packages/animations/example/android/gradle.properties

@@ -1,3 +1,2 @@
 org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true

packages/animations/example/android/settings.gradle

@@ -21,7 +21,7 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version "8.9.1" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.0" apply false
+    id "org.jetbrains.kotlin.android" version "2.2.0" apply false
     id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1"
 }
 

packages/camera/camera/example/android/gradle.properties

@@ -1,3 +1,2 @@
 org.gradle.jvmargs=-Xmx4G
 android.useAndroidX=true
-android.enableJetifier=false

packages/camera/camera/example/android/settings.gradle

@@ -20,7 +20,7 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version "8.9.1" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.0" apply false
+    id "org.jetbrains.kotlin.android" version "2.2.0" apply false
     id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1"
 
 }

packages/camera/camera_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.10.10+5
+
+* Updates kotlin version to 2.2.0 to enable gradle 8.11 support.
+
 ## 0.10.10+4
 
 * Fix flutter#166533 - prevent startImageStream OOM error when main thread paused.