Merge branch 'main' into go_router_current_state

.ci/flutter_master.version

@@ -1 +1 @@
-2d30fe448cd41eaf4778a735e852ec7a7bb6eaf9
+fe71cadf1959268ca5dd545863a195d78c232b74

.ci/flutter_stable.version

@@ -1 +1 @@
-4cf269e36de2573851eaef3c763994f8f9be494d
+603104015dd692ea3403755b55d07813d5cf8965

.ci/scripts/plugin_tools_format.sh

@@ -0,0 +1,8 @@
+#!/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
+
+cd script/tool
+dart format --set-exit-if-changed .

.ci/targets/repo_checks.yaml

@@ -4,6 +4,8 @@ tasks:
     infra_step: true # Note infra steps failing prevents "always" from running.
   - name: tool unit tests
     script: .ci/scripts/plugin_tools_tests.sh
+  - name: tool format
+    script: .ci/scripts/plugin_tools_format.sh
   - name: format
     script: .ci/scripts/tool_runner.sh
     # Skip Swift formatting on Linux builders.

.github/dependabot.yml

@@ -886,3 +886,14 @@ updates:
     ignore:
       - dependency-name: "*"
         update-types: ["version-update:semver-minor", "version-update:semver-patch"]
+
+  - package-ecosystem: "gradle"
+    directory: "/third_party/packages/flutter_svg/example/android/app"
+    commit-message:
+      prefix: "[flutter_svg]"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-minor", "version-update:semver-patch"]

.github/labeler.yml

@@ -138,6 +138,11 @@
     - any-glob-to-any-file:
       - packages/palette_generator/**/*
 
+'p: path_parsing':
+  - changed-files:
+    - any-glob-to-any-file:
+      - third_party/packages/path_parsing/**/*
+
 'p: path_provider':
   - changed-files:
     - any-glob-to-any-file:

.github/workflows/release.yml

@@ -36,7 +36,7 @@ jobs:
         cd $GITHUB_WORKSPACE
     # Checks out a copy of the repo.
     - name: Check out code
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       with:
         fetch-depth: 0 # Fetch all history so the tool can get all the tags to determine version.
     - name: Set up tools

CODEOWNERS

@@ -40,12 +40,18 @@ packages/shared_preferences/**                           @tarrinneal
 packages/standard_message_codec/**                       @jonahwilliams
 packages/two_dimensional_scrollables/**                  @Piinks
 packages/url_launcher/**                                 @stuartmorgan
+packages/vector_graphics/**                              @jonahwilliams
+packages/vector_graphics_codec/**                        @jonahwilliams
+packages/vector_graphics_compiler/**                     @jonahwilliams
 packages/video_player/**                                 @tarrinneal
 packages/web_benchmarks/**                               @yjbanov
 packages/webview_flutter/**                              @bparrishMines
 packages/xdg_directories/**                              @stuartmorgan
 third_party/packages/cupertino_icons/**                  @MitchellGoodwin
 third_party/packages/cupertino_icons/test/goldens/**     @LongCatIsLooong
+third_party/packages/flutter_svg/**                      @domesticmouse
+third_party/packages/flutter_svg_test/**                 @domesticmouse
+third_party/packages/path_parsing/**                     @domesticmouse
 
 # Plugin platform implementation rules. These should stay last, since the last
 # matching entry takes precedence.

analysis_options.yaml

@@ -48,7 +48,6 @@ linter:
     - avoid_init_to_null
     - avoid_js_rounded_ints
     # - avoid_multiple_declarations_per_line # seems to be a stylistic choice we don't subscribe to
-    - avoid_null_checks_in_equality_operators
     # - avoid_positional_boolean_parameters # would have been nice to enable this but by now there's too many places that break it
     - avoid_print
     # - avoid_private_typedef_functions # we prefer having typedef (discussion in https://github.com/flutter/flutter/pull/16356)
@@ -131,7 +130,7 @@ linter:
     # - one_member_abstracts # too many false positives
     - only_throw_errors # this does get disabled in a few places where we have legacy code that uses strings et al
     - overridden_fields
-    - package_api_docs
+    # - package_api_docs # Deprecated (https://github.com/dart-lang/linter/issues/5107)
     - package_names
     - package_prefixed_library_names
     # - parameter_assignments # we do this commonly
@@ -219,7 +218,6 @@ linter:
     - unnecessary_to_list_in_spreads
     - unreachable_from_main
     - unrelated_type_equality_checks
-    - unsafe_html
     - use_build_context_synchronously
     - use_colored_box
     # - use_decorated_box # leads to bugs: DecoratedBox and Container are not equivalent (Container inserts extra padding)

packages/camera/camera/example/integration_test/camera_test.dart

@@ -13,6 +13,10 @@ import 'package:integration_test/integration_test.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:video_player/video_player.dart';
 
+// Skip due to video_player error.
+// See https://github.com/flutter/flutter/issues/157181
+bool skipFor157181 = Platform.isAndroid;
+
 void main() {
   late Directory testDir;
 
@@ -177,7 +181,7 @@ void main() {
     await videoController.dispose();
 
     expect(duration, lessThan(recordingTime));
-  });
+  }, skip: skipFor157181);
 
   testWidgets('Pause and resume video recording', (WidgetTester tester) async {
     final List<CameraDescription> cameras = await availableCameras();
@@ -225,7 +229,7 @@ void main() {
     await videoController.dispose();
 
     expect(duration, lessThan(recordingTime - timePaused));
-  }, skip: !Platform.isAndroid);
+  }, skip: !Platform.isAndroid || skipFor157181);
 
   testWidgets(
     'Android image streaming',

packages/camera/camera/example/lib/main.dart

@@ -534,7 +534,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
           onPressed: cameraController != null &&
                   cameraController.value.isInitialized &&
                   cameraController.value.isRecordingVideo
-              ? (cameraController.value.isRecordingPaused)
+              ? cameraController.value.isRecordingPaused
                   ? onResumeButtonPressed
                   : onPauseButtonPressed
               : null,

packages/camera/camera/pubspec.yaml

@@ -32,7 +32,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  mockito: 5.4.4
+  mockito: ^5.4.4
   plugin_platform_interface: ^2.1.7
 
 topics:

packages/camera/camera_android/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 0.10.9+16
+
+* Updates annotations lib to 1.9.0.
+
+## 0.10.9+15
+
+* Converts Dart to native platform calls to Pigeon.
+
+## 0.10.9+14
+
+* Converts native to Dart platform calls to Pigeon.
+
+## 0.10.9+13
+
+* Converts `getAvailableCameras` to Pigeon.
+
+## 0.10.9+12
+
+* Updates Java compatibility version to 11.
+* Updates minimum supported SDK version to Flutter 3.24/Dart 3.5.
+
 ## 0.10.9+11
 
 * Updates annotations lib to 1.8.2.

packages/camera/camera_android/android/build.gradle

@@ -30,10 +30,7 @@ android {
 buildFeatures {
         buildConfig true
     }
-    // Conditional for compatibility with AGP <4.2.
-    if (project.android.hasProperty("namespace")) {
-        namespace 'io.flutter.plugins.camera'
-    }
+    namespace 'io.flutter.plugins.camera'
     compileSdk 34
 
     defaultConfig {
@@ -46,14 +43,18 @@ buildFeatures {
         disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     testOptions {
         unitTests.includeAndroidResources = true
         unitTests.returnDefaultValues = true
         unitTests.all {
+            // The org.gradle.jvmargs property that may be set in gradle.properties does not impact
+            // the Java heap size when running the Android unit tests. The following property here
+            // sets the heap size to a size large enough to run the robolectric tests across
+            // multiple SDK levels.
             jvmArgs "-Xmx1g"
             testLogging {
                events "passed", "skipped", "failed", "standardOut", "standardError"
@@ -65,7 +66,7 @@ buildFeatures {
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.8.2'
+    implementation 'androidx.annotation:annotation:1.9.0'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-inline:5.0.0'
     testImplementation 'androidx.test:core:1.4.0'