Merge branch 'main' into webview_patchedv5

* main: (139 commits) Change firebase device tests from Android api 30 to 33 (flutter#5185) [url_launcher] Add an `inAppBrowserView` mode (flutter#5205) [ci] Remove device_type property from Windows Arm64 properties (flutter#5193) [url_launcher_web] Disallows launching "javascript:" URLs. (flutter#5180) [local_auth]: Bump androidx.fragment:fragment from 1.6.0 to 1.6.1 in /packages/local_auth/local_auth_android/android (flutter#4600) Roll Flutter from 823e083 to 5e8b5f4 (13 revisions) (flutter#5208) [tool] Add optional swift-format support (flutter#5204) [camera] CameraPlatform.createCameraWithSettings (flutter#3615) Bump github/codeql-action from 2.22.3 to 2.22.4 (flutter#5201) Roll Flutter from 6f4850d to 823e083 (3 revisions) (flutter#5198) Bump actions/checkout from 4.1.0 to 4.1.1 (flutter#5167) Roll Flutter from 0883cb2 to 6f4850d (24 revisions) (flutter#5196) [ios_platform_images] migrate objC to swift (flutter#4847) [in_app_pur]: Bump org.json:json from 20230618 to 20231013 in /packages/in_app_purchase/in_app_purchase_android/example/android/app (flutter#5149) [in_app_pur]: Bump org.json:json from 20230618 to 20231013 in /packages/in_app_purchase/in_app_purchase_android/android (flutter#5150) [quick_actions] convert to pigeon (flutter#5159) [ci] Add build-only Windows Arm64 tests (flutter#5142) Add '--no-tree-shake-icons' option to `BenchmarkServer` (flutter#5186) Roll Flutter from c2bd2c1 to 0883cb2 (24 revisions) (flutter#5192) [ci] Finalize migration to x64 specific Windows platform (flutter#5174) ...
sybrands-place · Oct 24, 2023 · 813131e · 813131e
2 parents d830653 + 2faf992
commit 813131e
Show file tree

Hide file tree

Showing 840 changed files with 32,370 additions and 5,221 deletions.
diff --git a/.ci.yaml b/.ci.yaml
@@ -29,6 +29,18 @@ platform_properties:
           {"dependency": "open_jdk", "version": "version:17"},
           {"dependency": "curl", "version": "version:7.64.0"}
         ]
+  linux_android_legacy:
+    properties:
+      os: Ubuntu
+      cores: "8"
+      device_type: none
+      dependencies: >-
+        [
+          {"dependency": "android_sdk", "version": "version:33v6"},
+          {"dependency": "open_jdk", "version": "version:17"},
+          {"dependency": "curl", "version": "version:7.64.0"},
+          {"dependency": "android_virtual_device", "version": "22"}
+        ]
   linux_desktop:
     properties:
       os: Ubuntu
@@ -50,21 +62,30 @@ platform_properties:
         [
           {"dependency": "chrome_and_driver", "version": "version:114.0"}
         ]
-  windows:
+  windows_arm64:
+    properties:
+      dependencies: >
+        [
+          {"dependency": "certs", "version": "version:9563bb"}
+        ]
+      os: Windows
+      cpu: arm64
+  windows_x64:
     properties:
       dependencies: >
         [
           {"dependency": "certs", "version": "version:9563bb"}
         ]
       device_type: none
       os: Windows
+      cpu: x86
   mac_arm64:
     properties:
       dependencies: >-
         [
           {"dependency": "gems", "version": "v3.3.14"}
         ]
-      os: Mac-12
+      os: "Mac-12|Mac-13"
       device_type: none
       cpu: arm64
       $flutter/osx_sdk : >-
@@ -77,7 +98,7 @@ platform_properties:
         [
           {"dependency": "gems", "version": "v3.3.14"}
         ]
-      os: Mac-12
+      os: "Mac-12|Mac-13"
       device_type: none
       cpu: x86
       $flutter/osx_sdk : >-
@@ -380,6 +401,34 @@ targets:
           {"dependency": "android_virtual_device", "version": "33"}
         ]
 
+  - 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
+      channel: master
+      version_file: flutter_master.version
+      package_sharding: "--shardIndex 0 --shardCount 2"
+      dependencies: >-
+        [
+          {"dependency": "android_virtual_device", "version": "33"}
+        ]
+
+  - 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
+      channel: master
+      version_file: flutter_master.version
+      package_sharding: "--shardIndex 1 --shardCount 2"
+      dependencies: >-
+        [
+          {"dependency": "android_virtual_device", "version": "33"}
+        ]
+
   - name: Linux_android android_platform_tests_shard_1 stable
     recipe: packages/packages
     presubmit: false
@@ -464,6 +513,94 @@ targets:
           {"dependency": "android_virtual_device", "version": "33"}
         ]
 
+  - 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
+      channel: master
+      version_file: flutter_stable.version
+      package_sharding: "--shardIndex 0 --shardCount 2"
+      dependencies: >-
+        [
+          {"dependency": "android_virtual_device", "version": "33"}
+        ]
+
+  - 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
+      channel: master
+      version_file: flutter_stable.version
+      package_sharding: "--shardIndex 1 --shardCount 2"
+      dependencies: >-
+        [
+          {"dependency": "android_virtual_device", "version": "33"}
+        ]
+
+  - 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
+    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
+    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
+    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
+    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
+    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 5 --shardCount 6"
+
   # Device versions of Android integration tests, run via FTL.
   # TODO(stuartmorgan): Revisit whether physical device tests are redundant once
   # we have more data about emulator tests; see
@@ -836,7 +973,7 @@ targets:
       package_sharding: "--shardIndex 4 --shardCount 5"
 
   ### Windows desktop tasks ###
-  - name: Windows custom_package_tests master - packages
+  - name: Windows_x64 custom_package_tests master - packages
     recipe: packages/packages
     timeout: 60
     properties:
@@ -849,7 +986,7 @@ targets:
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
-  - name: Windows dart_unit_tests_shard_1 master
+  - name: Windows_x64 dart_unit_tests_shard_1 master
     recipe: packages/packages
     timeout: 60
     properties:
@@ -858,7 +995,7 @@ targets:
       version_file: flutter_master.version
       package_sharding: "--shardIndex 0 --shardCount 2"
 
-  - name: Windows dart_unit_tests_shard_2 master
+  - name: Windows_x64 dart_unit_tests_shard_2 master
     recipe: packages/packages
     timeout: 60
     properties:
@@ -867,7 +1004,7 @@ targets:
       version_file: flutter_master.version
       package_sharding: "--shardIndex 1 --shardCount 2"
 
-  - name: Windows win32-platform_tests_shard_1 master
+  - name: Windows_x64 win32-platform_tests_shard_1 master
     recipe: packages/packages
     timeout: 60
     properties:
@@ -881,7 +1018,7 @@ targets:
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
-  - name: Windows win32-platform_tests_shard_2 master
+  - name: Windows_x64 win32-platform_tests_shard_2 master
     recipe: packages/packages
     timeout: 60
     properties:
@@ -895,7 +1032,7 @@ targets:
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
-  - name: Windows win32-platform_tests_shard_1 stable
+  - name: Windows_x64 win32-platform_tests_shard_1 stable
     recipe: packages/packages
     timeout: 60
     properties:
@@ -909,7 +1046,7 @@ targets:
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
-  - name: Windows win32-platform_tests_shard_2 stable
+  - name: Windows_x64 win32-platform_tests_shard_2 stable
     recipe: packages/packages
     timeout: 60
     properties:
@@ -923,7 +1060,7 @@ targets:
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
-  - name: Windows windows-build_all_packages master
+  - name: Windows_x64 windows-build_all_packages master
     recipe: packages/packages
     timeout: 30
     properties:
@@ -936,9 +1073,37 @@ targets:
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
-  - name: Windows windows-build_all_packages stable
+  - name: Windows_arm64 windows-build_all_packages master
+    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: master
+      version_file: flutter_master.version
+      dependencies: >
+        [
+          {"dependency": "vs_build", "version": "version:vs2019"}
+        ]
+
+  - name: Windows_x64 windows-build_all_packages stable
+    recipe: packages/packages
+    timeout: 30
+    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_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
@@ -949,7 +1114,7 @@ targets:
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
-  - name: Windows repo_tools_tests
+  - name: Windows_x64 repo_tools_tests
     recipe: packages/packages
     timeout: 30
     properties:

diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version
@@ -1 +1 @@
-4e7a07af882c5d76d88fd458fa4b653c5e7a12fe
+5e8b5f4ea293b092e583c0fa9ad82fe189a72aa5
diff --git a/.ci/flutter_stable.version b/.ci/flutter_stable.version
@@ -1 +1 @@
-2524052335ec76bb03e04ede244b071f1b86d190
+6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e
diff --git a/.ci/legacy_project/all_packages/android/gradle.properties b/.ci/legacy_project/all_packages/android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx2G
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/.ci/scripts/boot_simulator.sh b/.ci/scripts/boot_simulator.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# 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.
+set -e
+
+# The name here must match create_simulator.sh
+readonly DEVICE_NAME=Flutter-iPhone
+
+# Allow boot to fail; cases like "Unable to boot device in current state: Booted"
+# exit with failure.
+xcrun simctl boot "$DEVICE_NAME" || :
+echo -e ""
+xcrun simctl list
diff --git a/.ci/scripts/create_simulator.sh b/.ci/scripts/create_simulator.sh
@@ -11,5 +11,18 @@ readonly DEVICE_NAME=Flutter-iPhone
 readonly DEVICE=com.apple.CoreSimulator.SimDeviceType.iPhone-14
 readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-16-4
 
-xcrun simctl list
+# Delete any existing devices named Flutter-iPhone. Having more than one may
+# cause issues when builds target the device.
+echo -e "Deleting any existing devices names $DEVICE_NAME..."
+RESULT=0
+while [[ $RESULT == 0 ]]; do
+    xcrun simctl delete "$DEVICE_NAME" || RESULT=1
+    if [ $RESULT == 0 ]; then
+        echo -e "Deleted $DEVICE_NAME"
+    fi
+done
+echo -e ""
+
+echo -e "\nCreating $DEVICE_NAME $DEVICE $OS ...\n"
 xcrun simctl create "$DEVICE_NAME" "$DEVICE" "$OS" | xargs xcrun simctl boot
+xcrun simctl list
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=redfin,version=30"
+      - "model=oriole,version=33"
       - "--exclude=script/configs/exclude_integration_android.yaml"
       - "--project=flutter-infra-staging"
       - "--results-bucket=flutter_firebase_testlab_staging"
diff --git a/.ci/targets/android_legacy_emulator_tests.yaml b/.ci/targets/android_legacy_emulator_tests.yaml
@@ -0,0 +1,16 @@
+tasks:
+  - name: prepare tool
+    script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
+  - name: download Dart and Android deps
+    script: script/tool_runner.sh
+    infra_step: true
+    args: ["fetch-deps", "--android", "--supporting-target-platforms-only", "--exclude=script/configs/exclude_integration_android_legacy_emulator.yaml"]
+  # Only these two tests are run because they are the only ones that use the
+  # emulator. Other tests would just duplicate android_platform_test.yaml tests.
+  - name: native integration tests
+    script: script/tool_runner.sh
+    args: ["native-test", "--android", "--no-unit", "--exclude=script/configs/exclude_integration_android_legacy_emulator.yaml"]
+  - name: drive examples
+    script: script/tool_runner.sh
+    args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android_legacy_emulator.yaml,script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml"]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		4e7a07af882c5d76d88fd458fa4b653c5e7a12fe
		5e8b5f4ea293b092e583c0fa9ad82fe189a72aa5
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2524052335ec76bb03e04ede244b071f1b86d190
		6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e