Merge branch 'main' into fix/typo

Author: filiph

.ci/flutter_master.version

@@ -1 +1 @@
-2578d97f32c8ac47f446059a0a03dc434838e83e
+b16430b2fd57a5aa6b6c680cdbda5582506fe120

.ci/flutter_stable.version

@@ -1 +1 @@
-68415ad1d920f6fe5ec284f5c2febf7c4dd5b0b3
+09de023485e95e6d1225c2baa44b8feb85e0d45f

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,22 +2,24 @@
 
 *List which issues are fixed by this PR. You must list at least one issue.*
 
-## Pre-launch Checklist
+## Pre-Review Checklist
 
 - [ ] I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
 - [ ] I read the [Tree Hygiene] page, which explains my responsibilities.
 - [ ] I read and followed the [relevant style guides] and ran the auto-formatter. (Unlike the flutter/flutter repo, the flutter/packages repo does use `dart format`.)
 - [ ] I signed the [CLA].
 - [ ] The title of the PR starts with the name of the package surrounded by square brackets, e.g. `[shared_preferences]`
 - [ ] I [linked to at least one issue that this PR fixes] in the description above.
-- [ ] I updated `pubspec.yaml` with an appropriate new version according to the [pub versioning philosophy], or this PR is [exempt from version changes].
-- [ ] I updated `CHANGELOG.md` to add a description of the change, [following repository CHANGELOG style], or this PR is [exempt from CHANGELOG changes].
-- [ ] I updated/added relevant documentation (doc comments with `///`).
-- [ ] I added new tests to check the change I am making, or this PR is [test-exempt].
+- [ ] I updated `pubspec.yaml` with an appropriate new version according to the [pub versioning philosophy], or I have commented below to indicate which [version change exemption] this PR falls under[^1].
+- [ ] I updated `CHANGELOG.md` to add a description of the change, [following repository CHANGELOG style], or I have commented below to indicate which [CHANGELOG exemption] this PR falls under[^1].
+- [ ] I updated/added any relevant documentation (doc comments with `///`).
+- [ ] I added new tests to check the change I am making, or I have commented below to indicate which [test exemption] this PR falls under[^1].
 - [ ] All existing and new tests are passing.
 
 If you need help, consider asking for advice on the #hackers-new channel on [Discord].
 
+[^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.
+
 <!-- Links -->
 [Contributor Guide]: https://github.com/flutter/packages/blob/main/CONTRIBUTING.md
 [Tree Hygiene]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md
@@ -26,7 +28,7 @@ If you need help, consider asking for advice on the #hackers-new channel on [Dis
 [Discord]: https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md
 [linked to at least one issue that this PR fixes]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#overview
 [pub versioning philosophy]: https://dart.dev/tools/pub/versioning
-[exempt from version changes]: https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#version
+[version change exemption]: https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#version
 [following repository CHANGELOG style]: https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changelog-style
-[exempt from CHANGELOG changes]: https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changelog
-[test-exempt]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#tests
+[CHANGELOG exemption]: https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changelog
+[test exemption]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#tests

packages/camera/camera/test/camera_value_test.dart

@@ -146,8 +146,22 @@ void main() {
         description: FakeController.fakeDescription,
       );
 
-      expect(cameraValue.toString(),
-          'CameraValue(isRecordingVideo: false, isInitialized: false, errorDescription: null, previewSize: Size(10.0, 10.0), isStreamingImages: false, flashMode: FlashMode.auto, exposureMode: ExposureMode.auto, focusMode: FocusMode.auto, exposurePointSupported: true, focusPointSupported: true, deviceOrientation: DeviceOrientation.portraitUp, lockedCaptureOrientation: DeviceOrientation.portraitUp, recordingOrientation: DeviceOrientation.portraitUp, isPreviewPaused: true, previewPausedOrientation: DeviceOrientation.portraitUp, description: CameraDescription(, CameraLensDirection.back, 0))');
+      expect(
+          cameraValue.toString(),
+          'CameraValue(isRecordingVideo: false, isInitialized: false, '
+          'errorDescription: null, previewSize: Size(10.0, 10.0), '
+          'isStreamingImages: false, flashMode: FlashMode.auto, '
+          'exposureMode: ExposureMode.auto, focusMode: FocusMode.auto, '
+          'exposurePointSupported: true, focusPointSupported: true, '
+          'deviceOrientation: DeviceOrientation.portraitUp, '
+          'lockedCaptureOrientation: DeviceOrientation.portraitUp, '
+          'recordingOrientation: DeviceOrientation.portraitUp, '
+          'isPreviewPaused: true, '
+          'previewPausedOrientation: DeviceOrientation.portraitUp, '
+          // CameraDescription.toString is defined in the platform interface
+          // package, so don't assert a specific value for it, only that
+          // whatever it returns is inserted as expected.
+          'description: ${FakeController.fakeDescription})');
     });
   });
 }

packages/camera/camera_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.10.10+1
+
+* Updates compileSdk 34 to flutter.compileSdkVersion.
+
 ## 0.10.10
 
 * Adds API support query for image streaming.

packages/camera/camera_android/android/build.gradle

@@ -31,7 +31,7 @@ buildFeatures {
         buildConfig true
     }
     namespace 'io.flutter.plugins.camera'
-    compileSdk 34
+    compileSdk = flutter.compileSdkVersion
 
     defaultConfig {
         minSdkVersion 21

packages/camera/camera_android/pubspec.yaml

@@ -3,11 +3,11 @@ description: Android implementation of the camera plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
 
-version: 0.10.10
+version: 0.10.10+1
 
 environment:
-  sdk: ^3.5.0
-  flutter: ">=3.24.0"
+  sdk: ^3.6.0
+  flutter: ">=3.27.0"
 
 flutter:
   plugin:

packages/camera/camera_android_camerax/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.14+1
+
+* Updates compileSdk 34 to flutter.compileSdkVersion.
+
 ## 0.6.14
 
 * Fixes incorrect camera preview rotation.

packages/camera/camera_android_camerax/android/build.gradle

@@ -24,7 +24,7 @@ apply plugin: 'com.android.library'
 android {
     namespace 'io.flutter.plugins.camerax'
     // CameraX dependencies require compilation against version 33 or later.
-    compileSdk 34
+    compileSdk = flutter.compileSdkVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11

packages/camera/camera_android_camerax/pubspec.yaml

@@ -2,7 +2,7 @@ name: camera_android_camerax
 description: Android implementation of the camera plugin using the CameraX library.
 repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.6.14
+version: 0.6.14+1
 
 environment:
   sdk: ^3.6.0