Pull latest main branch changes into v4_webview

.ci.yaml

@@ -25,8 +25,149 @@ platform_properties:
         ]
       device_type: none
       os: Windows
+  mac_x64:
+    properties:
+      dependencies: >-
+        [
+          {"dependency": "xcode", "version": "14a5294e"},
+          {"dependency": "gems", "version": "v3.3.14"}
+        ]
+      os: Mac-12
+      device_type: none
+      cpu: x86
+      xcode: 14a5294e # xcode 14.0 beta 5
+
 
 targets:
+  ### 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.
+  - name: Mac_x64 lint_podspecs
+    recipe: plugins/plugins
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6637
+    timeout: 30
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: mac_lint_podspecs.yaml
+
+  ### macOS desktop tasks ###
+  # macos-platform_tests builds all the plugins on M1, so this build is run
+  # on Intel to give us build coverage of both host types.
+  - name: Mac_x64 build_all_plugins master
+    recipe: plugins/plugins
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6671
+    timeout: 30
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: mac_build_all_plugins.yaml
+      channel: master
+
+  - name: Mac_x64 build_all_plugins stable
+    recipe: plugins/plugins
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6671
+    timeout: 30
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: mac_build_all_plugins.yaml
+      channel: stable
+
+  ### iOS tasks ###
+  # TODO(stuartmorgan): Swap this and ios-build_all_plugins once simulator
+  # tests are reliable on the ARM infrastructure. See discussion at
+  # https://github.com/flutter/plugins/pull/5693#issuecomment-1126011089
+  - name: Mac_x64 ios_platform_tests_1_of_4 master
+    recipe: plugins/plugins
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6682
+    timeout: 30
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: mac_ios_platform_tests.yaml
+      package_sharding: "--shardIndex 0 --shardCount 4"
+
+  - name: Mac_x64 ios_platform_tests_2_of_4 master
+    recipe: plugins/plugins
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6682
+    timeout: 30
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: mac_ios_platform_tests.yaml
+      package_sharding: "--shardIndex 1 --shardCount 4"
+
+  - name: Mac_x64 ios_platform_tests_3_of_4 master
+    recipe: plugins/plugins
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6682
+    timeout: 30
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: mac_ios_platform_tests.yaml
+      package_sharding: "--shardIndex 2 --shardCount 4"
+
+  - name: Mac_x64 ios_platform_tests_4_of_4 master
+    recipe: plugins/plugins
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6682
+    timeout: 30
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: mac_ios_platform_tests.yaml
+      package_sharding: "--shardIndex 3 --shardCount 4"
+
+  # Don't run full platform tests on both channels in pre-submit.
+  - name: Mac_x64 ios_platform_tests_1_of_4 stable
+    recipe: plugins/plugins
+    presubmit: false
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6682
+    timeout: 30
+    properties:
+      channel: stable
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: mac_ios_platform_tests.yaml
+      package_sharding: "--shardIndex 0 --shardCount 4"
+
+  - name: Mac_x64 ios_platform_tests_2_of_4 stable
+    recipe: plugins/plugins
+    presubmit: false
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6682
+    timeout: 30
+    properties:
+      channel: stable
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: mac_ios_platform_tests.yaml
+      package_sharding: "--shardIndex 1 --shardCount 4"
+
+  - name: Mac_x64 ios_platform_tests_3_of_4 stable
+    recipe: plugins/plugins
+    presubmit: false
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6682
+    timeout: 30
+    properties:
+      channel: stable
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: mac_ios_platform_tests.yaml
+      package_sharding: "--shardIndex 2 --shardCount 4"
+
+  - name: Mac_x64 ios_platform_tests_4_of_4 stable
+    recipe: plugins/plugins
+    presubmit: false
+    bringup: true # New target: https://github.com/flutter/plugins/pull/6682
+    timeout: 30
+    properties:
+      channel: stable
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: mac_ios_platform_tests.yaml
+      package_sharding: "--shardIndex 3 --shardCount 4"
+
   - name: Windows win32-platform_tests master
     recipe: plugins/plugins
     timeout: 30

.ci/flutter_master.version

@@ -1 +1 @@
-0e98194681fdd83ee1c0a90b8b5b176df121bf1e
+61e927d22fe6d82c94c368d62aa81f733bd9218d

.ci/flutter_stable.version

@@ -1 +1 @@
-6928314d505d2bb4777be05e45d7808a5aa91d2a
+52b3dc25f6471c27b2144594abb11c741cb88f57

.ci/scripts/build_all_plugins.sh

@@ -3,6 +3,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+platform="$1"
+build_mode="$2"
 cd all_packages
-flutter build windows --debug
-flutter build windows --release
+flutter build "$platform" --"$build_mode"

.ci/scripts/create_simulator.sh

@@ -0,0 +1,10 @@
+#!/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.
+
+device=com.apple.CoreSimulator.SimDeviceType.iPhone-11
+os=com.apple.CoreSimulator.SimRuntime.iOS-16-0
+
+xcrun simctl list
+xcrun simctl create Flutter-iPhone "$device" "$os" | xargs xcrun simctl boot

.ci/targets/build_all_plugins.yaml

@@ -3,5 +3,9 @@ tasks:
     script: .ci/scripts/prepare_tool.sh
   - name: create all_plugins app
     script: .ci/scripts/create_all_plugins_app.sh
-  - name: build all_plugins
+  - name: build all_plugins debug
     script: .ci/scripts/build_all_plugins.sh
+    args: ["windows", "debug"]
+  - name: build all_plugins release
+    script: .ci/scripts/build_all_plugins.sh
+    args: ["windows", "release"]

.ci/targets/mac_build_all_plugins.yaml

@@ -0,0 +1,11 @@
+tasks:
+  - name: prepare tool
+    script: .ci/scripts/prepare_tool.sh
+  - name: create all_plugins app
+    script: .ci/scripts/create_all_plugins_app.sh
+  - name: build all_plugins debug
+    script: .ci/scripts/build_all_plugins.sh
+    args: ["macos", "debug"]
+  - name: build all_plugins release
+    script: .ci/scripts/build_all_plugins.sh
+    args: ["macos", "release"]

.ci/targets/mac_ios_platform_tests.yaml

@@ -0,0 +1,22 @@
+tasks:
+  - name: create simulator
+    script: .ci/scripts/create_simulator.sh
+  - name: build examples
+    script: script/tool_runner.sh
+    args: ["build-examples", "--ios"]
+  - name: xcode analyze
+    script: script/tool_runner.sh
+    args: ["xcode-analyze", "--ios"]
+  - name: xcode analyze deprecation
+    # Ensure we don't accidentally introduce deprecated code.
+    script: script/tool_runner.sh
+    args: ["xcode-analyze", "--ios", "--ios-min-version=13.0"]
+  - name: native test
+    script: script/tool_runner.sh
+    args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=iPhone 11,OS=latest"]
+  - name: drive examples
+    # `drive-examples` contains integration tests, which changes the UI of the application.
+    # This UI change sometimes affects `xctest`.
+    # So we run `drive-examples` after `native-test`; changing the order will result ci failure.
+    script: script/tool_runner.sh
+    args: ["drive-examples", "--ios", "--exclude=script/configs/exclude_integration_ios.yaml"]

.ci/targets/mac_lint_podspecs.yaml

@@ -0,0 +1,6 @@
+tasks:
+  - name: prepare tool
+    script: .ci/scripts/prepare_tool.sh
+  - name: lint iOS and macOS podspecs
+    script: script/tool_runner.sh
+    args: ["podspecs"]

.cirrus.yml

@@ -1,4 +1,4 @@
-gcp_credentials: ENCRYPTED[!f1177d1ddb5330ffaa9ea11c9c9e8e0c542185e895c36071f18cec923dd31c50ece6d18da89c2f6f1cd2d1a98d0c2eea!]
+gcp_credentials: ENCRYPTED[!9e38557f08108136b3625b7e62c64cc9eccc50365ffeaaa55c6be52f1d8fd6225af5badc69983ca08484274f02f34424!]
 
 # Run on PRs and main branch post submit only. Don't run tests when tagging.
 only_if: $CIRRUS_TAG == '' && ($CIRRUS_PR != '' || $CIRRUS_BRANCH == 'main')
@@ -245,7 +245,7 @@ task:
           CHANNEL: "master"
           CHANNEL: "stable"
         MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
-        GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[30e6cf7189e3ff3868edc25d2e638ef2aec70546456427064bbc74b297d36145364f49f9d26b327787a59df149d69262]
+        GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[4457646586de940f49e054de7d82e60078b205ac627f11a89d077e63f639c9ba1002541d9209a9ee7777e159e97b43d0]
       build_script:
         - ./script/tool_runner.sh build-examples --apk
       lint_script:

packages/video_player/video_player_android/CHANGELOG.md

@@ -3,6 +3,7 @@
 * Updates code for `no_leading_underscores_for_local_identifiers` lint.
 * Updates minimum Flutter version to 2.10.
 * Fixes violations of new analysis option use_named_constants.
+* Removes an unnecessary override in example code.
 
 ## 2.3.9
 

packages/video_player/video_player_android/example/lib/mini_controller.dart

@@ -341,11 +341,6 @@ class MiniController extends ValueNotifier<VideoPlayerValue> {
   void _updatePosition(Duration position) {
     value = value.copyWith(position: position);
   }
-
-  @override
-  void removeListener(VoidCallback listener) {
-    super.removeListener(listener);
-  }
 }
 
 /// Widget that displays the video controlled by [controller].

packages/video_player/video_player_avfoundation/CHANGELOG.md

@@ -1,3 +1,8 @@
+## NEXT
+
+* Adds an integration test for a bug where the aspect ratios of some HLS videos are incorrectly inverted.
+* Removes an unnecessary override in example code.
+
 ## 2.3.7
 
 * Fixes a bug where the aspect ratio of some HLS videos are incorrectly inverted.

packages/video_player/video_player_avfoundation/example/integration_test/video_player_test.dart

@@ -177,5 +177,19 @@ void main() {
       expect(livestreamController.value.duration,
           (Duration duration) => duration != Duration.zero);
     });
+
+    testWidgets('rotated m3u8 has correct aspect ratio',
+        (WidgetTester tester) async {
+      // Some m3u8 files contain rotation data that may incorrectly invert the aspect ratio.
+      // More info [here](https://github.com/flutter/flutter/issues/109116).
+      final MiniController livestreamController = MiniController.network(
+        'https://flutter.github.io/assets-for-api-docs/assets/videos/hls/rotated_nail_manifest.m3u8',
+      );
+      await livestreamController.initialize();
+
+      expect(livestreamController.value.isInitialized, true);
+      expect(livestreamController.value.size.width,
+          lessThan(livestreamController.value.size.height));
+    });
   });
 }

packages/video_player/video_player_avfoundation/example/lib/mini_controller.dart

@@ -341,11 +341,6 @@ class MiniController extends ValueNotifier<VideoPlayerValue> {
   void _updatePosition(Duration position) {
     value = value.copyWith(position: position);
   }
-
-  @override
-  void removeListener(VoidCallback listener) {
-    super.removeListener(listener);
-  }
 }
 
 /// Widget that displays the video controlled by [controller].

packages/webview_flutter/webview_flutter/CHANGELOG.md

@@ -5,6 +5,7 @@
 * Fixes avoid_redundant_argument_values lint warnings and minor typos.
 * Ignores unnecessary import warnings in preparation for [upcoming Flutter changes](https://github.com/flutter/flutter/pull/104231).
 * Updates references to the obsolete master branch.
+* Fixes typo from lowercase to uppercase.
 
 ## 3.0.4
 

packages/webview_flutter/webview_flutter/lib/src/webview.dart

@@ -315,7 +315,7 @@ class _WebViewState extends State<WebView> {
       webViewPlatformCallbacksHandler: _platformCallbacksHandler,
       javascriptChannelRegistry: _javascriptChannelRegistry,
       gestureRecognizers: widget.gestureRecognizers,
-      creationParams: _creationParamsfromWidget(widget),
+      creationParams: _creationParamsFromWidget(widget),
     );
   }
 
@@ -360,7 +360,7 @@ class _WebViewState extends State<WebView> {
   }
 }
 
-CreationParams _creationParamsfromWidget(WebView widget) {
+CreationParams _creationParamsFromWidget(WebView widget) {
   return CreationParams(
     initialUrl: widget.initialUrl,
     webSettings: _webSettingsFromWidget(widget),

script/tool/CHANGELOG.md

@@ -1,3 +1,9 @@
+## NEXT
+
+* Pins `package:git` dependency to `2.0.x` until `dart >=2.18.0` becomes our
+  oldest legacy.
+* Updates test mocks.
+
 ## 0.13.0
 
 * Renames `all-plugins-app` to `create-all-packages-app` to clarify what it

script/tool/pubspec.yaml

@@ -9,7 +9,8 @@ dependencies:
   collection: ^1.15.0
   colorize: ^3.0.0
   file: ^6.1.0
-  git: ^2.0.0
+  # Pin git to 2.0.x until dart >=2.18 is legacy
+  git: '>=2.0.0 <2.1.0'
   http: ^0.13.3
   http_multi_server: ^3.0.1
   meta: ^1.3.0