Merge branch 'develop' into 4-oct-video-player-interface-updates

Author: nateshmbhat

.ci.yaml

@@ -31,7 +31,8 @@ platform_properties:
           {"dependency": "android_sdk", "version": "version:36v3"},
           {"dependency": "open_jdk", "version": "version:17"},
           {"dependency": "curl", "version": "version:7.64.0"},
-          {"dependency": "avd_cipd_version", "version": "build_id:8719362231152674241"}
+          {"dependency": "avd_cipd_version", "version": "build_id:8719362231152674241"},
+          {"dependency": "ninja", "version": "version:1.9.0"}
         ]
   linux_android_legacy:
     properties:
@@ -47,7 +48,8 @@ platform_properties:
           {"dependency": "open_jdk", "version": "version:17"},
           {"dependency": "curl", "version": "version:7.64.0"},
           {"dependency": "android_virtual_device", "version": "android_31_google_apis_x64.textpb"},
-          {"dependency": "avd_cipd_version", "version": "build_id:8733065022087935185"}
+          {"dependency": "avd_cipd_version", "version": "build_id:8733065022087935185"},
+          {"dependency": "ninja", "version": "version:1.9.0"}
         ]
   linux_desktop:
     properties:

.ci/flutter_master.version

@@ -1 +1 @@
-7cd821c21093ed44efc1ef1498121404925f541c
+e5d5c01850f2d33106f00a19017682f09e83e48b

.ci/flutter_stable.version

@@ -1 +1 @@
-9f455d2486bcb28cad87b062475f42edc959f636
+adc901062556672b4138e18a4dc62a4be8f4b3c2

.ci/scripts/prepare_tool.sh

@@ -4,8 +4,9 @@
 # found in the LICENSE file.
 set -e
 
-# To set FETCH_HEAD for "git merge-base" to work
+# Ensure that 'main' is present for diffing.
 git fetch origin main
+git branch main origin/main
 
 cd script/tool
 dart pub get

.github/labeler.yml

@@ -67,17 +67,17 @@
 'p: google_adsense':
   - changed-files:
     - any-glob-to-any-file:
-      - packages/google_adsense/**
+      - packages/google_adsense/**/*
 
 'p: google_identity_services':
   - changed-files:
     - any-glob-to-any-file:
-      - packages/google_indentity_services_web/**
+      - packages/google_identity_services_web/**/*
 
 'p: google_fonts':
   - changed-files:
     - any-glob-to-any-file:
-      - packages/google_fonts/**
+      - packages/google_fonts/**/*
 
 'p: google_maps_flutter':
   - changed-files:
@@ -119,6 +119,11 @@
     - any-glob-to-any-file:
       - packages/multicast_dns/**/*
 
+'p: mustache_template':
+  - changed-files:
+    - any-glob-to-any-file:
+      - third_party/packages/mustache_template/**/*
+
 'p: path_parsing':
   - changed-files:
     - any-glob-to-any-file:
@@ -164,6 +169,11 @@
     - any-glob-to-any-file:
       - packages/standard_message_codec/**/*
 
+'p: two_dimensional_scrollables':
+  - changed-files:
+    - any-glob-to-any-file:
+      - packages/two_dimensional_scrollables/**/*
+
 'p: url_launcher':
   - changed-files:
     - any-glob-to-any-file:
@@ -243,3 +253,22 @@
       - packages/*/*_windows/**/*
       - packages/**/windows/**/*
 
+'triage-engine':
+  - changed-files:
+    - any-glob-to-any-file:
+      - packages/vector_graphics/**/*
+      - packages/vector_graphics_codec/**/*
+      - packages/vector_graphics_compiler/**/*
+      - third_party/packages/flutter_svg/**/*
+      - third_party/packages/flutter_svg_test/**/*
+
+'triage-framework':
+  - changed-files:
+    - any-glob-to-any-file:
+      - packages/animations/**/*
+      - packages/flutter_lints/**/*
+      - packages/go_router/**/*
+      - packages/go_router_builder/**/*
+      - packages/google_fonts/**/*
+      - packages/two_dimensional_scrollables/**/*
+      - third_party/packages/cupertino_icons/**/*

CODEOWNERS

@@ -103,11 +103,11 @@ packages/video_player/video_player_avfoundation/**            @LongCatIsLooong @
 packages/webview_flutter/webview_flutter_wkwebview/**         @louisehsu
 
 # - Linux
-packages/file_selector/file_selector_linux/**                 @stuartmorgan-g
-packages/image_picker/image_picker_linux/**                   @stuartmorgan-g
-packages/path_provider/path_provider_linux/**                 @stuartmorgan-g
-packages/shared_preferences/shared_preferences_linux/**       @stuartmorgan-g
-packages/url_launcher/url_launcher_linux/**                   @stuartmorgan-g
+packages/file_selector/file_selector_linux/**                 @robert-ancell @stuartmorgan-g
+packages/image_picker/image_picker_linux/**                   @robert-ancell @stuartmorgan-g
+packages/path_provider/path_provider_linux/**                 @robert-ancell @stuartmorgan-g
+packages/shared_preferences/shared_preferences_linux/**       @robert-ancell @stuartmorgan-g
+packages/url_launcher/url_launcher_linux/**                   @robert-ancell @stuartmorgan-g
 
 # - Windows
 packages/camera/camera_windows/**                             @stuartmorgan-g

packages/animations/CHANGELOG.md

@@ -1,5 +1,6 @@
 ## 2.1.0
 
+* Updates examples to use the new RadioGroup API instead of deprecated Radio parameters.
 * Updates minimum supported SDK version to Flutter 3.29/Dart 3.7.
 * Make `OpenContainerState` public.
 

packages/animations/example/lib/shared_axis_transition.dart

@@ -76,34 +76,28 @@ class _SharedAxisTransitionDemoState extends State<SharedAxisTransitionDemo> {
               ),
             ),
             const Divider(thickness: 2.0),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: <Widget>[
-                Radio<SharedAxisTransitionType>(
-                  value: SharedAxisTransitionType.horizontal,
-                  groupValue: _transitionType,
-                  onChanged: (SharedAxisTransitionType? newValue) {
-                    _updateTransitionType(newValue);
-                  },
-                ),
-                const Text('X'),
-                Radio<SharedAxisTransitionType>(
-                  value: SharedAxisTransitionType.vertical,
-                  groupValue: _transitionType,
-                  onChanged: (SharedAxisTransitionType? newValue) {
-                    _updateTransitionType(newValue);
-                  },
-                ),
-                const Text('Y'),
-                Radio<SharedAxisTransitionType>(
-                  value: SharedAxisTransitionType.scaled,
-                  groupValue: _transitionType,
-                  onChanged: (SharedAxisTransitionType? newValue) {
-                    _updateTransitionType(newValue);
-                  },
-                ),
-                const Text('Z'),
-              ],
+            RadioGroup<SharedAxisTransitionType>(
+              groupValue: _transitionType,
+              onChanged: (SharedAxisTransitionType? newValue) {
+                _updateTransitionType(newValue);
+              },
+              child: const Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: <Widget>[
+                  Radio<SharedAxisTransitionType>(
+                    value: SharedAxisTransitionType.horizontal,
+                  ),
+                  Text('X'),
+                  Radio<SharedAxisTransitionType>(
+                    value: SharedAxisTransitionType.vertical,
+                  ),
+                  Text('Y'),
+                  Radio<SharedAxisTransitionType>(
+                    value: SharedAxisTransitionType.scaled,
+                  ),
+                  Text('Z'),
+                ],
+              ),
             ),
           ],
         ),

packages/camera/camera/CHANGELOG.md

@@ -1,5 +1,11 @@
-## NEXT
+## 0.11.3
 
+* Adds support to configure persistent recording on Android. See `CameraController.startVideoRecording(enablePersistentRecording)`.
+* Updates minimum supported SDK version to Flutter 3.35.0/Dart 3.9.
+
+## 0.11.2+1
+
+* Updates examples to use the new RadioGroup API instead of deprecated Radio parameters.
 * Updates minimum supported SDK version to Flutter 3.29/Dart 3.7.
 * Updates README to reflect that only Android API 24+ is supported.
 

packages/camera/camera/example/android/app/src/androidTest/java/io/flutter/plugins/DartIntegrationTest.java

@@ -14,7 +14,7 @@
  * a native java unit test or a java class with a dart integration.
  *
  * See: https://github.com/flutter/flutter/blob/master/docs/ecosystem/testing/Plugin-Tests.md#enabling-android-ui-tests
- * for more infomation.
+ * for more information.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)