Merge branch 'main' into webview_patchedv5

* main: (59 commits) [pointer_interceptor] Move pointer_interceptor to sub folder (flutter#5291) [webview_flutter] Update iOS to Pigeon 13 (flutter#5271) [repo] Adjust error message layout for repo checks (flutter#5241) [in_app_pur]: Bump org.json:json from 20230618 to 20231013 in /packages/in_app_purchase/in_app_purchase/example/android/app (flutter#5153) Roll Flutter from f5a9835 to 5a6a322 (15 revisions) (flutter#5345) [google_sign_in_ios] Upgrade GoogleSignIn iOS SDK to 7.0 (flutter#5240) Roll Flutter from 29b2516 to f5a9835 (101 revisions) (flutter#5341) [pigeon]: Bump org.jetbrains.kotlin:kotlin-gradle-plugin from 1.9.10 to 1.9.20 in /packages/pigeon/platform_tests/test_plugin/android (flutter#5334) [flutter_markdown] Strip leading whitespace from list items (flutter#5294) [two_dimensional_scrollables] Add borderRadius support to TableSpanDecoration (flutter#5184) [go_router] Adds an ability to add a custom codec for serializing/des… (flutter#5288) [go_router] Fixes crashes when dynamically updates routing tables wit… (flutter#5242) [camerax] Fix `_getResolutionSelectorFromPreset` NPE (flutter#5287) [go_router]Fixes the problem what pathParameters is null in redirect when the Router is recreated. (flutter#5258) [google_sign_in] Fix Obj-C formatting bug (flutter#5310) Fix mounted checks (flutter#5305) [flutter_image] [flutter_markdown] Do not use dynamic in an == operator override (flutter#5298) [google_sign_in] Enable FedCM for web. Use token expiration. (flutter#5225) [video_player_web] Listen to loadedmetadata event from video element. (flutter#5289) [local_auth] Update iOS to Pigeon 13 (flutter#5269) ... # Conflicts: # packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewHostApi.m
sybrands-place · Nov 8, 2023 · 49a3170 · 49a3170
2 parents 813131e + 94c7623
commit 49a3170
Show file tree

Hide file tree

Showing 336 changed files with 7,545 additions and 3,047 deletions.
diff --git a/.ci.yaml b/.ci.yaml
@@ -83,7 +83,7 @@ platform_properties:
     properties:
       dependencies: >-
         [
-          {"dependency": "gems", "version": "v3.3.14"}
+          {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
         ]
       os: "Mac-12|Mac-13"
       device_type: none
@@ -96,7 +96,7 @@ platform_properties:
     properties:
       dependencies: >-
         [
-          {"dependency": "gems", "version": "v3.3.14"}
+          {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
         ]
       os: "Mac-12|Mac-13"
       device_type: none
@@ -271,7 +271,7 @@ targets:
       # web_benchmarks needs Chrome.
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"},
+          {"dependency": "android_virtual_device", "version": "34"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "chrome_and_driver", "version": "version:114.0"}
         ]
@@ -288,7 +288,7 @@ targets:
       # See comments on 'master' version above.
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"},
+          {"dependency": "android_virtual_device", "version": "34"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "chrome_and_driver", "version": "version:114.0"}
         ]
@@ -323,17 +323,21 @@ targets:
           {"dependency": "open_jdk", "version": "version:11"}
         ]
 
+  # All of the Linux_android android_platform_tests shards have the same
+  # dependency list, despite some running on Android 33 AVDs versus 34.
+  # See https://github.com/flutter/flutter/issues/137082 for context.
   - name: Linux_android android_platform_tests_shard_1 master
     recipe: packages/packages
     timeout: 60
     properties:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
+      # set up for 34
       package_sharding: "--shardIndex 0 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_shard_2 master
@@ -343,10 +347,11 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
+      # set up for 34
       package_sharding: "--shardIndex 1 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_shard_3 master
@@ -356,10 +361,11 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
+      # set up for 34
       package_sharding: "--shardIndex 2 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_shard_4 master
@@ -369,10 +375,11 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
+      # set up for 34
       package_sharding: "--shardIndex 3 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_shard_5 master
@@ -382,10 +389,11 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
+      # set up for 34
       package_sharding: "--shardIndex 4 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_shard_6 master
@@ -395,20 +403,21 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
+      # set up for 34
       package_sharding: "--shardIndex 5 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_api_33_shard_1 master
     recipe: packages/packages
     timeout: 60
-    bringup: true
     properties:
-      target_file: android_platform_tests_api_33.yaml
+      target_file: android_platform_tests_api_33_avd.yaml
       channel: master
       version_file: flutter_master.version
+      # set up for 33
       package_sharding: "--shardIndex 0 --shardCount 2"
       dependencies: >-
         [
@@ -418,11 +427,11 @@ targets:
   - name: Linux_android android_platform_tests_api_33_shard_2 master
     recipe: packages/packages
     timeout: 60
-    bringup: true
     properties:
-      target_file: android_platform_tests_api_33.yaml
+      target_file: android_platform_tests_api_33_avd.yaml
       channel: master
       version_file: flutter_master.version
+      # set up for 33
       package_sharding: "--shardIndex 1 --shardCount 2"
       dependencies: >-
         [
@@ -440,7 +449,7 @@ targets:
       package_sharding: "--shardIndex 0 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_shard_2 stable
@@ -454,7 +463,7 @@ targets:
       package_sharding: "--shardIndex 1 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_shard_3 stable
@@ -468,7 +477,7 @@ targets:
       package_sharding: "--shardIndex 2 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_shard_4 stable
@@ -482,7 +491,7 @@ targets:
       package_sharding: "--shardIndex 3 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_shard_5 stable
@@ -496,7 +505,7 @@ targets:
       package_sharding: "--shardIndex 4 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_shard_6 stable
@@ -510,15 +519,14 @@ targets:
       package_sharding: "--shardIndex 5 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_api_33_shard_1 stable
     recipe: packages/packages
     timeout: 60
-    bringup: true
     properties:
-      target_file: android_platform_tests_api_33.yaml
+      target_file: android_platform_tests_api_33_avd.yaml
       channel: master
       version_file: flutter_stable.version
       package_sharding: "--shardIndex 0 --shardCount 2"
@@ -530,9 +538,8 @@ targets:
   - name: Linux_android android_platform_tests_api_33_shard_2 stable
     recipe: packages/packages
     timeout: 60
-    bringup: true
     properties:
-      target_file: android_platform_tests_api_33.yaml
+      target_file: android_platform_tests_api_33_avd.yaml
       channel: master
       version_file: flutter_stable.version
       package_sharding: "--shardIndex 1 --shardCount 2"
@@ -541,60 +548,54 @@ targets:
           {"dependency": "android_virtual_device", "version": "33"}
         ]
 
-  - name: linux_android_legacy android_platform_tests_legacy_api_shard_1 master
+  - name: Linux_android_legacy android_platform_tests_legacy_api_shard_1 master
     recipe: packages/packages
     timeout: 60
-    bringup: true # New target
     properties:
       target_file: android_legacy_emulator_tests.yaml
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 0 --shardCount 6"
 
-  - name: linux_android_legacy android_platform_tests_legacy_api_shard_2 master
+  - name: Linux_android_legacy android_platform_tests_legacy_api_shard_2 master
     recipe: packages/packages
     timeout: 60
-    bringup: true # New target
     properties:
       target_file: android_legacy_emulator_tests.yaml
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 1 --shardCount 6"
 
-  - name: linux_android_legacy android_platform_tests_legacy_api_shard_3 master
+  - name: Linux_android_legacy android_platform_tests_legacy_api_shard_3 master
     recipe: packages/packages
     timeout: 60
-    bringup: true # New target
     properties:
       target_file: android_legacy_emulator_tests.yaml
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 2 --shardCount 6"
 
-  - name: linux_android_legacy android_platform_tests_legacy_api_shard_4 master
+  - name: Linux_android_legacy android_platform_tests_legacy_api_shard_4 master
     recipe: packages/packages
     timeout: 60
-    bringup: true # New target
     properties:
       target_file: android_legacy_emulator_tests.yaml
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 3 --shardCount 6"
 
-  - name: linux_android_legacy android_platform_tests_legacy_api_shard_5 master
+  - name: Linux_android_legacy android_platform_tests_legacy_api_shard_5 master
     recipe: packages/packages
     timeout: 60
-    bringup: true # New target
     properties:
       target_file: android_legacy_emulator_tests.yaml
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 4 --shardCount 6"
 
-  - name: linux_android_legacy android_platform_tests_legacy_api_shard_6 master
+  - name: Linux_android_legacy android_platform_tests_legacy_api_shard_6 master
     recipe: packages/packages
     timeout: 60
-    bringup: true # New target
     properties:
       target_file: android_legacy_emulator_tests.yaml
       channel: master
@@ -608,7 +609,7 @@ targets:
 
   - name: Linux_android android_device_tests_shard_1 master
     recipe: packages/packages
-    timeout: 60
+    timeout: 90
     properties:
       target_file: android_device_tests.yaml
       channel: master
@@ -617,7 +618,7 @@ targets:
 
   - name: Linux_android android_device_tests_shard_2 master
     recipe: packages/packages
-    timeout: 60
+    timeout: 90
     properties:
       target_file: android_device_tests.yaml
       channel: master
@@ -626,7 +627,7 @@ targets:
 
   - name: Linux_android android_device_tests_shard_3 master
     recipe: packages/packages
-    timeout: 60
+    timeout: 90
     properties:
       target_file: android_device_tests.yaml
       channel: master
@@ -635,7 +636,7 @@ targets:
 
   - name: Linux_android android_device_tests_shard_4 master
     recipe: packages/packages
-    timeout: 60
+    timeout: 90
     properties:
       target_file: android_device_tests.yaml
       channel: master
@@ -644,7 +645,7 @@ targets:
 
   - name: Linux_android android_device_tests_shard_5 master
     recipe: packages/packages
-    timeout: 60
+    timeout: 90
     properties:
       target_file: android_device_tests.yaml
       channel: master
@@ -653,7 +654,7 @@ targets:
 
   - name: Linux_android android_device_tests_shard_6 master
     recipe: packages/packages
-    timeout: 60
+    timeout: 90
     properties:
       target_file: android_device_tests.yaml
       channel: master
@@ -1100,20 +1101,6 @@ targets:
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
-  - name: Windows_arm64 windows-build_all_packages stable
-    recipe: packages/packages
-    timeout: 30
-    bringup: true # https://github.com/flutter/flutter/issues/134083
-    properties:
-      add_recipes_cq: "true"
-      target_file: windows_build_all_packages.yaml
-      channel: stable
-      version_file: flutter_stable.version
-      dependencies: >
-        [
-          {"dependency": "vs_build", "version": "version:vs2019"}
-        ]
-
   - name: Windows_x64 repo_tools_tests
     recipe: packages/packages
     timeout: 30

diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version
@@ -1 +1 @@
-5e8b5f4ea293b092e583c0fa9ad82fe189a72aa5
+5a6a3224fe1502dc2f1f05c13268f3e96bc89461
diff --git a/.ci/flutter_stable.version b/.ci/flutter_stable.version
@@ -1 +1 @@
-6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e
+d211f42860350d914a5ad8102f9ec32764dc6d06
diff --git a/.ci/targets/android_device_tests.yaml b/.ci/targets/android_device_tests.yaml
@@ -11,7 +11,7 @@ tasks:
     args:
       - "firebase-test-lab"
       - "--device"
-      - "model=oriole,version=33"
+      - "model=panther,version=33"
       - "--exclude=script/configs/exclude_integration_android.yaml"
       - "--project=flutter-infra-staging"
       - "--results-bucket=flutter_firebase_testlab_staging"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		5e8b5f4ea293b092e583c0fa9ad82fe189a72aa5
		5a6a3224fe1502dc2f1f05c13268f3e96bc89461
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e
		d211f42860350d914a5ad8102f9ec32764dc6d06