Skip to content

Commit abdfa17

Browse files
bparrishMinesbparrishMines
committed
Merge branch 'main' of github.com:flutter/packages into ima_ad_event_ad
2 parents dda426c + 287739d commit abdfa17

File tree

127 files changed

+3153
-1210
lines changed

Some content is hidden

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

127 files changed

+3153
-1210
lines changed

‎.ci/flutter_master.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b1a28bc065b0acc50bc2284be87a9a708bd7aa85
1+
96fe3b3df509d451116124f0abbd288e36a03805

‎.ci/flutter_stable.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d693b4b9dbac2acd4477aea4555ca6dcbea44ba2
1+
ac4e799d237041cf905519190471f657b657155a

‎CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
packages/animations/** @hannah-hyj
88
packages/camera/** @bparrishMines
9-
packages/cross_file/** @stuartmorgan
10-
packages/extension_google_sign_in_as_googleapis_auth/** @stuartmorgan
9+
packages/cross_file/** @stuartmorgan-g
10+
packages/extension_google_sign_in_as_googleapis_auth/** @stuartmorgan-g
1111
packages/file_selector/** @stuartmorgan-g
1212
packages/flutter_lints/** @chunhtai
1313
packages/flutter_template_images/** @stuartmorgan-g

‎packages/animations/example/android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ android {
1111
ndkVersion = flutter.ndkVersion
1212

1313
compileOptions {
14-
sourceCompatibility JavaVersion.VERSION_11
15-
targetCompatibility JavaVersion.VERSION_11
14+
sourceCompatibility = JavaVersion.VERSION_11
15+
targetCompatibility = JavaVersion.VERSION_11
1616
}
1717

1818
kotlinOptions {

‎packages/camera/camera/example/android/app/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if (flutterVersionName == null) {
2323
}
2424

2525
android {
26-
namespace 'io.flutter.plugins.cameraexample'
26+
namespace = "io.flutter.plugins.cameraexample"
2727
compileSdk = flutter.compileSdkVersion
2828

2929

@@ -56,8 +56,8 @@ flutter {
5656
}
5757

5858
dependencies {
59-
testImplementation 'junit:junit:4.13.2'
60-
androidTestImplementation 'androidx.test:runner:1.2.0'
61-
androidTestImplementation 'androidx.test:rules:1.2.0'
62-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
59+
testImplementation("junit:junit:4.13.2")
60+
androidTestImplementation("androidx.test:runner:1.2.0")
61+
androidTestImplementation("androidx.test:rules:1.2.0")
62+
androidTestImplementation("androidx.test.espresso:espresso-core:3.2.0")
6363
}

‎packages/camera/camera_android/android/build.gradle‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ android {
3030
buildFeatures {
3131
buildConfig true
3232
}
33-
namespace 'io.flutter.plugins.camera'
33+
namespace = "io.flutter.plugins.camera"
3434
compileSdk = 36
3535

3636
defaultConfig {
@@ -43,8 +43,8 @@ buildFeatures {
4343
disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'
4444
}
4545
compileOptions {
46-
sourceCompatibility JavaVersion.VERSION_11
47-
targetCompatibility JavaVersion.VERSION_11
46+
sourceCompatibility = JavaVersion.VERSION_11
47+
targetCompatibility = JavaVersion.VERSION_11
4848
}
4949

5050
testOptions {
@@ -66,9 +66,9 @@ buildFeatures {
6666
}
6767

6868
dependencies {
69-
implementation 'androidx.annotation:annotation:1.9.1'
70-
testImplementation 'junit:junit:4.13.2'
71-
testImplementation 'org.mockito:mockito-inline:5.2.0'
72-
testImplementation 'androidx.test:core:1.7.0'
73-
testImplementation 'org.robolectric:robolectric:4.15.1'
69+
implementation("androidx.annotation:annotation:1.9.1")
70+
testImplementation("junit:junit:4.13.2")
71+
testImplementation("org.mockito:mockito-inline:5.2.0")
72+
testImplementation("androidx.test:core:1.7.0")
73+
testImplementation("org.robolectric:robolectric:4.15.1")
7474
}

‎packages/camera/camera_android/example/android/app/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if (flutterVersionName == null) {
2323
}
2424

2525
android {
26-
namespace 'io.flutter.plugins.cameraexample'
26+
namespace = "io.flutter.plugins.cameraexample"
2727
compileSdk = flutter.compileSdkVersion
2828

2929

@@ -56,8 +56,8 @@ flutter {
5656
}
5757

5858
dependencies {
59-
testImplementation 'junit:junit:4.13.2'
60-
androidTestImplementation 'androidx.test:runner:1.2.0'
61-
androidTestImplementation 'androidx.test:rules:1.2.0'
62-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
59+
testImplementation("junit:junit:4.13.2")
60+
androidTestImplementation("androidx.test:runner:1.2.0")
61+
androidTestImplementation("androidx.test:rules:1.2.0")
62+
androidTestImplementation("androidx.test.espresso:espresso-core:3.2.0")
6363
}

‎packages/camera/camera_android_camerax/CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
## 0.6.23
2+
3+
* Converts NV21-compatible streamed images to NV21 when requested. In doing so,
4+
this plugin should now be compatible with [google_ml_kit_flutter](https://github.com/flutter-ml/google_ml_kit_flutter/tree/master).
5+
6+
## 0.6.22
7+
8+
* Implements `setDescriptionWhileRecording`.
9+
110
## 0.6.21+2
211

312
* Bumps com.google.guava:guava from 33.4.8-android to 33.5.0-android.

‎packages/camera/camera_android_camerax/README.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ use cases, the plugin behaves according to the following:
3434
video recording and image streaming is supported, but concurrent video recording, image
3535
streaming, and image capture is not supported.
3636

37-
### `setDescriptionWhileRecording` is unimplemented [Issue #148013][148013]
38-
`setDescriptionWhileRecording`, used to switch cameras while recording video, is currently unimplemented
39-
due to this not currently being supported by CameraX.
40-
4137
### 240p resolution configuration for video recording
4238

4339
240p resolution configuration for video recording is unsupported by CameraX, and thus,
@@ -73,6 +69,12 @@ in the merged Android manifest of your app, then take the following steps to rem
7369
tools:node="remove" />
7470
```
7571

72+
### Notes on video capture
73+
74+
#### Setting description while recording
75+
To avoid cancelling any active recording when calling `setDescriptionWhileRecording`,
76+
you must start the recording with `startVideoCapturing` with `enablePersistentRecording` set to `true`.
77+
7678
### Notes on image streaming
7779

7880
#### Allowing image streaming in the background

‎packages/camera/camera_android_camerax/android/build.gradle‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ apply plugin: 'com.android.library'
2525
apply plugin: 'kotlin-android'
2626

2727
android {
28-
namespace 'io.flutter.plugins.camerax'
28+
namespace = "io.flutter.plugins.camerax"
2929
// CameraX dependencies require compilation against version 33 or later.
3030
compileSdk = flutter.compileSdkVersion
3131

3232
compileOptions {
33-
sourceCompatibility JavaVersion.VERSION_11
34-
targetCompatibility JavaVersion.VERSION_11
33+
sourceCompatibility = JavaVersion.VERSION_11
34+
targetCompatibility = JavaVersion.VERSION_11
3535
}
3636

3737
kotlinOptions {
@@ -73,14 +73,14 @@ android {
7373
dependencies {
7474
// CameraX core library using the camera2 implementation must use same version number.
7575
def camerax_version = "1.5.0"
76-
implementation "androidx.camera:camera-core:${camerax_version}"
77-
implementation "androidx.camera:camera-camera2:${camerax_version}"
78-
implementation "androidx.camera:camera-lifecycle:${camerax_version}"
79-
implementation "androidx.camera:camera-video:${camerax_version}"
80-
implementation 'com.google.guava:guava:33.5.0-android'
81-
testImplementation 'junit:junit:4.13.2'
82-
testImplementation "org.mockito:mockito-core:5.19.0"
83-
testImplementation 'org.mockito:mockito-inline:5.2.0'
84-
testImplementation 'androidx.test:core:1.7.0'
85-
testImplementation 'org.robolectric:robolectric:4.15.1'
76+
implementation("androidx.camera:camera-core:${camerax_version}")
77+
implementation("androidx.camera:camera-camera2:${camerax_version}")
78+
implementation("androidx.camera:camera-lifecycle:${camerax_version}")
79+
implementation("androidx.camera:camera-video:${camerax_version}")
80+
implementation("com.google.guava:guava:33.5.0-android")
81+
testImplementation("junit:junit:4.13.2")
82+
testImplementation("org.mockito:mockito-core:5.19.0")
83+
testImplementation("org.mockito:mockito-inline:5.2.0")
84+
testImplementation("androidx.test:core:1.7.0")
85+
testImplementation("org.robolectric:robolectric:4.15.1")
8686
}

0 commit comments

Comments
 (0)