Skip to content

Commit c79efed

Browse files
authored
Merge branch 'main' into dependabot/gradle/packages/camera/camera_android_camerax/android/com.android.tools.build-gradle-8.4.1
2 parents 5e0cff1 + 11e192a commit c79efed

File tree

278 files changed

+1054
-8058
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+1054
-8058
lines changed

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
656447127360f389513d0b689d7b4a6ebfb75800
1+
b295c86b2e855d697d357b83e152ed1e0ec488c2

.ci/legacy_project/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,11 @@ and then deleting everything but `android/` from it:
4242
- Updates `gradle-wrapper.properties` from `6.7` to `6.7.1`, to add
4343
support for the Kotlin gradle plugin. If a user runs into this
4444
error, the error message is clear on how to upgrade.
45+
- Modifies `build.gradle` to upgrade the Android Gradle Plugin (AGP)
46+
from version 4.1.0 to 7.0.0. If a user runs into an error with
47+
the AGP version, the warning is clear on how to upgrade
48+
the version to one that we support.
49+
- Modifies `gradle-wrapper.properties` to upgrade the Gradle version
50+
from 6.7.1 to 7.0.2. If a user runs into an error with the Gradle
51+
version, the warning is clear on how to upgrade the version to
52+
one that we support.

.ci/legacy_project/all_packages/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:4.1.0'
8+
classpath 'com.android.tools.build:gradle:7.0.0'
99
}
1010
}
1111

.ci/legacy_project/all_packages/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

.github/dependabot.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -107,17 +107,6 @@ updates:
107107
- dependency-name: "*"
108108
update-types: ["version-update:semver-minor", "version-update:semver-patch"]
109109

110-
- package-ecosystem: "gradle"
111-
directory: "/packages/dynamic_layouts/example/android/app"
112-
commit-message:
113-
prefix: "[dynamic_lyts]"
114-
schedule:
115-
interval: "weekly"
116-
open-pull-requests-limit: 10
117-
ignore:
118-
- dependency-name: "*"
119-
update-types: ["version-update:semver-minor", "version-update:semver-patch"]
120-
121110
- package-ecosystem: "gradle"
122111
directory: "/packages/espresso/android"
123112
commit-message:

.github/labeler.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@
2323
- any-glob-to-any-file:
2424
- third_party/packages/cupertino_icons/**/*
2525

26-
'p: dynamic_layouts':
27-
- changed-files:
28-
- any-glob-to-any-file:
29-
- packages/dynamic_layouts/**/*
30-
3126
'p: espresso':
3227
- changed-files:
3328
- any-glob-to-any-file:

CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ packages/animations/** @goderbauer
88
packages/camera/** @bparrishMines
99
packages/cross_file/** @ditman
1010
packages/css_colors/** @stuartmorgan
11-
packages/dynamic_layouts/** @Piinks
1211
packages/extension_google_sign_in_as_googleapis_auth/** @ditman
1312
packages/file_selector/** @stuartmorgan
1413
packages/flutter_adaptive_scaffold/** @gspencergoog

packages/camera/camera/CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
## NEXT
1+
## 0.11.0+1
22

33
* Updates minimum supported SDK version to Flutter 3.16/Dart 3.2.
4+
* Adds note to `README.md` about allowing image streaming in the background on Android.
45

56
## 0.11.0
67

packages/camera/camera/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ better support for more devices than `camera_android`, but has some limitations;
5050
for more details. If you wish to use the [`camera_android`][4] implementation of the camera plugin
5151
built with Camera2 that lacks these limitations, please follow [these instructions][5].
5252

53+
If you wish to allow image streaming while your app is in the background, there are additional steps required;
54+
please see [these instructions][6] for more details.
55+
5356
### Web integration
5457

5558
For web integration details, see the
@@ -174,3 +177,4 @@ For a more elaborate usage example see [here](https://github.com/flutter/package
174177
[3]: https://pub.dev/packages/camera_android_camerax#limitations
175178
[4]: https://pub.dev/packages/camera_android
176179
[5]: https://pub.dev/packages/camera_android#usage
180+
[6]: https://pub.dev/packages/camera_android_camerax#allowing-image-streaming-in-the-background

packages/camera/camera/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: A Flutter plugin for controlling the camera. Supports previewing
44
Dart.
55
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera
66
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
7-
version: 0.11.0
7+
version: 0.11.0+1
88

99
environment:
1010
sdk: ^3.2.3

0 commit comments

Comments
 (0)