Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/main' into camx_def
  • Loading branch information
camsim99 committed May 6, 2024
commit 9c511bb8bb04663c4ca23304b3785c812eb96998
4 changes: 4 additions & 0 deletions packages/camera/camera/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

* **Breaking Change** Changes the Android implementation of the camera plugin from `camera_android`
to `camera_android_camerax`. To continue using `camera_android`, use `camera <0.11.0`.

## 0.10.6

* Adds support to control video fps and bitrate. See `CameraController` constructor.
* Updates minimum supported SDK version to Flutter 3.13/Dart 3.1.
* Updates support matrix in README to indicate that iOS 11 is no longer supported.
* Clients on versions of Flutter that still support iOS 11 can continue to use this
Expand Down
6 changes: 3 additions & 3 deletions packages/camera/camera/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ flutter:

dependencies:
camera_android_camerax: ^0.6.4
camera_avfoundation: ^0.9.13
camera_platform_interface: ^2.5.0
camera_web: ^0.3.1
camera_avfoundation: ^0.9.15
camera_platform_interface: ^2.6.0
camera_web: ^0.3.3
flutter:
sdk: flutter
flutter_plugin_android_lifecycle: ^2.0.2
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/camera_android_camerax/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ For more information on contributing to this plugin, see [`CONTRIBUTING.md`](CON
[3]: https://flutter.dev/docs/development/packages-and-plugins/developing-packages#endorsed-federated-plugin
[4]: https://pub.dev/packages/camera_android
[5]: https://github.com/flutter/flutter/issues/new/choose
[6]: https://pub.dev/packages/camera_android#usage
[6]: https://pub.dev/packages/camera_android#usage
You are viewing a condensed version of this merge commit. You can view the full changes here.