Skip to content

Commit 657c701

Browse files
dhc-techvictorsanni
authored andcommitted
[camera_android_camerax] Bump cameraxVersion to 1.6.2, remove concurrent-futures workaround (flutter#12698)
Bumps `cameraxVersion` from 1.6.1 to 1.6.2. This release includes an upstream fix (https://issuetracker.google.com/issues/543937345) removing the JSpecify type-use annotation that required consumers to explicitly declare `androidx.concurrent:concurrent-futures` on their compile classpath. With 1.6.2, that workaround (added in flutter#12373) is no longer needed, so this PR removes the explicit dependency and its regression test. Verified the fix is actually present in the published 1.6.2 artifact by decompiling `SurfaceRequest.class` from `camera-core-1.6.2.aar` — the `mSurfaceRecreationCompleter` field no longer carries the JSpecify `@NonNull` type annotation that caused the original compile failure. Fixes flutter/flutter#190505 ## Pre-Review Checklist
1 parent 048ffce commit 657c701

4 files changed

Lines changed: 9 additions & 38 deletions

File tree

‎packages/camera/camera_android_camerax/CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## 0.7.4+8
2+
3+
* Bumps cameraxVersion from 1.6.1 to 1.6.2.
4+
* Removes the explicit `androidx.concurrent:concurrent-futures` dependency
5+
workaround, as camera-core 1.6.2 includes an
6+
upstream fix that makes it unnecessary.
7+
18
## 0.7.4+7
29

310
* Updates pigeon dev_dependency to ^27.3.2 for analyzer 14 compatibility.

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,12 @@ android {
7676

7777
dependencies {
7878
// CameraX core library using the camera2 implementation must use same version number.
79-
val cameraxVersion = "1.6.1"
79+
val cameraxVersion = "1.6.2"
8080
implementation("androidx.camera:camera-core:${cameraxVersion}")
8181
implementation("androidx.camera:camera-camera2:${cameraxVersion}")
8282
implementation("androidx.camera:camera-lifecycle:${cameraxVersion}")
8383
implementation("androidx.camera:camera-video:${cameraxVersion}")
8484
implementation("com.google.guava:guava:33.5.0-android")
85-
// camera-core's compiled classes reference CallbackToFutureAdapter type annotations;
86-
// without this explicit dependency, javac fails to resolve them during compilation.
87-
// Upstream: https://issuetracker.google.com/issues/543937345
88-
implementation("androidx.concurrent:concurrent-futures:1.2.0")
8985
testImplementation("junit:junit:4.13.2")
9086
testImplementation("org.mockito:mockito-core:5.23.0")
9187
testImplementation("org.mockito:mockito-inline:5.2.0")

‎packages/camera/camera_android_camerax/android/src/test/java/io/flutter/plugins/camerax/ConcurrentFuturesDependencyTest.java‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎packages/camera/camera_android_camerax/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: camera_android_camerax
22
description: Android implementation of the camera plugin using the CameraX library.
33
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
5-
version: 0.7.4+7
5+
version: 0.7.4+8
66

77
environment:
88
sdk: ^3.12.0

0 commit comments

Comments
 (0)