QR Code: Partial MLKit Revert - #19708
Merged
Merged
Conversation
Generated by 🚫 dangerJS |
Contributor
Generated by 🚫 Danger |
Contributor
|
Found 1 violations: The PR caused the following dependency changes: +--- com.automattic:stories:2.4.0
| \--- com.automattic.stories:photoeditor:2.4.0
-| +--- androidx.camera:camera-core:1.0.0-alpha06 -> 1.2.3
-| | +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
-| | +--- androidx.annotation:annotation-experimental:1.1.0 -> 1.3.0 (*)
-| | +--- androidx.concurrent:concurrent-futures:1.0.0 -> 1.1.0 (*)
-| | +--- androidx.core:core:1.1.0 -> 1.10.0 (*)
-| | +--- androidx.exifinterface:exifinterface:1.3.2 -> 1.3.6 (*)
-| | +--- androidx.lifecycle:lifecycle-common:2.1.0 -> 2.6.2 (*)
-| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.6.2 (*)
-| | +--- com.google.auto.value:auto-value-annotations:1.6.3
-| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
-| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.10 (*)
+| +--- androidx.camera:camera-core:1.0.0-alpha06
+| | +--- com.google.auto.value:auto-value-annotations:1.6.3
+| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
+| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.6.2 (*)
+| | +--- androidx.lifecycle:lifecycle-common:2.1.0 -> 2.6.2 (*)
+| | +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6 (*)
+| | +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
+| | +--- androidx.core:core:1.1.0 -> 1.10.0 (*)
+| | \--- androidx.concurrent:concurrent-futures:1.0.0-alpha03 -> 1.1.0 (*)
-| \--- androidx.camera:camera-camera2:1.0.0-alpha06 -> 1.2.3
-| +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
-| +--- androidx.camera:camera-core:1.2.3 (*)
-| +--- androidx.concurrent:concurrent-futures:1.0.0 -> 1.1.0 (*)
-| +--- androidx.core:core:1.1.0 -> 1.10.0 (*)
-| +--- com.google.auto.value:auto-value-annotations:1.6.3
-| \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
+| \--- androidx.camera:camera-camera2:1.0.0-alpha06
+| +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
+| +--- androidx.camera:camera-core:1.0.0-alpha06 (*)
+| +--- androidx.core:core:1.1.0 -> 1.10.0 (*)
+| +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
+| \--- androidx.concurrent:concurrent-futures:1.0.0-alpha03 -> 1.1.0 (*)
++--- com.google.android.gms:play-services-code-scanner:16.0.0-beta3
+| +--- androidx.activity:activity:1.3.1 -> 1.8.0 (*)
+| +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0
+| | \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+| +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8
+| | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+| | +--- com.google.android.datatransport:transport-api:3.0.0 (*)
+| | +--- com.google.android.datatransport:transport-runtime:3.1.8
+| | | +--- androidx.annotation:annotation:1.3.0 -> 1.6.0 (*)
+| | | +--- com.google.android.datatransport:transport-api:3.0.0 (*)
+| | | +--- com.google.firebase:firebase-encoders:17.0.0
+| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+| | | +--- com.google.firebase:firebase-encoders-proto:16.0.0
+| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+| | | | \--- com.google.firebase:firebase-encoders:17.0.0 (*)
+| | | \--- javax.inject:javax.inject:1
+| | +--- com.google.firebase:firebase-encoders:17.0.0 (*)
+| | \--- com.google.firebase:firebase-encoders-json:18.0.0
+| | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+| | \--- com.google.firebase:firebase-encoders:17.0.0 (*)
+| +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
+| +--- com.google.android.gms:play-services-base:18.1.0 (*)
+| +--- com.google.android.gms:play-services-basement:18.1.0 (*)
+| +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
+| +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0
+| | +--- androidx.annotation:annotation:1.5.0 -> 1.6.0 (*)
+| | +--- com.google.errorprone:error_prone_annotations:2.9.0 -> 2.15.0
+| | \--- com.google.firebase:firebase-annotations:16.2.0
+| | \--- javax.inject:javax.inject:1
+| +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
+| +--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
+| +--- com.google.mlkit:barcode-scanning-common:17.0.0
+| | +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
+| | \--- com.google.mlkit:vision-common:17.0.0
+| | +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6 (*)
+| | +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0 (*)
+| | +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8 (*)
+| | +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
+| | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.1.0 (*)
+| | +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
+| | +--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.0.2 (*)
+| | +--- com.google.android.odml:image:1.0.0-beta1
+| | +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0 (*)
+| | +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
+| | +--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
+| | \--- com.google.mlkit:common:18.0.0 -> 18.5.0
+| | +--- androidx.core:core:1.0.0 -> 1.10.0 (*)
+| | +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0 (*)
+| | +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8 (*)
+| | +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
+| | +--- com.google.android.gms:play-services-base:18.1.0 (*)
+| | +--- com.google.android.gms:play-services-basement:18.1.0 (*)
+| | +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
+| | +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0 (*)
+| | +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
+| | \--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
+| \--- com.google.mlkit:common:18.5.0 (*)
-+--- com.google.mlkit:barcode-scanning-common:17.0.0
-| +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
-| \--- com.google.mlkit:vision-common:17.0.0 -> 17.3.0
-| +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6 (*)
-| +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0
-| | \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-| +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8
-| | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-| | +--- com.google.android.datatransport:transport-api:3.0.0 (*)
-| | +--- com.google.android.datatransport:transport-runtime:3.1.8
-| | | +--- androidx.annotation:annotation:1.3.0 -> 1.6.0 (*)
-| | | +--- com.google.android.datatransport:transport-api:3.0.0 (*)
-| | | +--- com.google.firebase:firebase-encoders:17.0.0
-| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-| | | +--- com.google.firebase:firebase-encoders-proto:16.0.0
-| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-| | | | \--- com.google.firebase:firebase-encoders:17.0.0 (*)
-| | | \--- javax.inject:javax.inject:1
-| | +--- com.google.firebase:firebase-encoders:17.0.0 (*)
-| | \--- com.google.firebase:firebase-encoders-json:18.0.0
-| | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-| | \--- com.google.firebase:firebase-encoders:17.0.0 (*)
-| +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
-| +--- com.google.android.gms:play-services-base:18.1.0 (*)
-| +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-| +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
-| +--- com.google.android.odml:image:1.0.0-beta1
-| +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0
-| | +--- androidx.annotation:annotation:1.5.0 -> 1.6.0 (*)
-| | +--- com.google.errorprone:error_prone_annotations:2.9.0 -> 2.15.0
-| | \--- com.google.firebase:firebase-annotations:16.2.0
-| | \--- javax.inject:javax.inject:1
-| +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
-| +--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
-| \--- com.google.mlkit:common:18.6.0 -> 18.9.0
-| +--- androidx.core:core:1.0.0 -> 1.10.0 (*)
-| +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0 (*)
-| +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8 (*)
-| +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
-| +--- com.google.android.gms:play-services-base:18.1.0 (*)
-| +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-| +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
-| +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0 (*)
-| +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
-| \--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
+\--- com.google.mlkit:barcode-scanning-common:17.0.0 (*)
-+--- com.google.mlkit:text-recognition:16.0.0
-| +--- com.google.android.gms:play-services-base:18.1.0 (*)
-| +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-| +--- com.google.android.gms:play-services-mlkit-text-recognition:19.0.0
-| | +--- com.google.android.gms:play-services-base:18.1.0 (*)
-| | +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-| | +--- com.google.android.gms:play-services-mlkit-text-recognition-common:19.0.0
-| | | +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0 (*)
-| | | +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8 (*)
-| | | +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
-| | | +--- com.google.android.gms:play-services-base:18.1.0 (*)
-| | | +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-| | | +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
-| | | +--- com.google.android.odml:image:1.0.0-beta1
-| | | +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0 (*)
-| | | +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
-| | | +--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
-| | | +--- com.google.mlkit:common:18.8.0 -> 18.9.0 (*)
-| | | +--- com.google.mlkit:vision-common:17.3.0 (*)
-| | | \--- com.google.mlkit:vision-interfaces:16.2.0
-| | | +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-| | | \--- com.google.android.gms:play-services-tasks:18.0.2 (*)
-| | \--- com.google.mlkit:common:18.8.0 -> 18.9.0 (*)
-| +--- com.google.mlkit:common:18.8.0 -> 18.9.0 (*)
-| \--- com.google.mlkit:text-recognition-bundled-common:16.0.0
-| +--- com.google.android.gms:play-services-base:18.1.0 (*)
-| +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-| +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
-| +--- com.google.mlkit:common:18.8.0 -> 18.9.0 (*)
-| \--- com.google.mlkit:vision-common:17.3.0 (*)
-+--- com.google.mlkit:barcode-scanning:17.2.0
-| +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-| +--- com.google.android.gms:play-services-mlkit-barcode-scanning:18.3.0
-| | +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0 (*)
-| | +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8 (*)
-| | +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
-| | +--- com.google.android.gms:play-services-base:18.1.0 (*)
-| | +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-| | +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
-| | +--- com.google.android.odml:image:1.0.0-beta1
-| | +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0 (*)
-| | +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
-| | +--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
-| | +--- com.google.mlkit:barcode-scanning-common:17.0.0 (*)
-| | +--- com.google.mlkit:common:18.9.0 (*)
-| | +--- com.google.mlkit:vision-common:17.3.0 (*)
-| | \--- com.google.mlkit:vision-interfaces:16.2.0 (*)
-| +--- com.google.mlkit:barcode-scanning-common:17.0.0 (*)
-| +--- com.google.mlkit:common:18.9.0 (*)
-| \--- com.google.mlkit:vision-common:17.3.0 (*)
-+--- androidx.camera:camera-camera2:1.2.3 (*)
-+--- androidx.camera:camera-lifecycle:1.2.3
-| +--- androidx.camera:camera-core:1.2.3 (*)
-| +--- androidx.concurrent:concurrent-futures:1.0.0 -> 1.1.0 (*)
-| +--- androidx.core:core:1.1.0 -> 1.10.0 (*)
-| +--- androidx.lifecycle:lifecycle-common:2.1.0 -> 2.6.2 (*)
-| +--- com.google.auto.value:auto-value-annotations:1.6.3
-| \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
-\--- androidx.camera:camera-view:1.2.3
- +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
- +--- androidx.annotation:annotation-experimental:1.1.0 -> 1.3.0 (*)
- +--- androidx.appcompat:appcompat:1.1.0 -> 1.6.1 (*)
- +--- androidx.camera:camera-core:1.2.3 (*)
- +--- androidx.camera:camera-lifecycle:1.2.3 (*)
- +--- androidx.concurrent:concurrent-futures:1.0.0 -> 1.1.0 (*)
- +--- androidx.core:core:1.3.2 -> 1.10.0 (*)
- +--- androidx.lifecycle:lifecycle-common:2.0.0 -> 2.6.2 (*)
- +--- com.google.auto.value:auto-value-annotations:1.6.3
- \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
Please review and act accordingly
|
Contributor
|
| App Name | Jetpack |
|
| Flavor | Jalapeno | |
| Build Type | Debug | |
| Version | pr19708-80d3d57 | |
| Commit | 80d3d57 | |
| Direct Download | jetpack-prototype-build-pr19708-80d3d57.apk |
Contributor
|
| App Name | WordPress |
|
| Flavor | Jalapeno | |
| Build Type | Debug | |
| Version | pr19708-80d3d57 | |
| Commit | 80d3d57 | |
| Direct Download | wordpress-prototype-build-pr19708-80d3d57.apk |
Contributor
Story Post✅ Emulator (Android 14) |
Contributor
[JP] Scan Login Code - Success✅ |
RenanLukas
approved these changes
Dec 1, 2023
RenanLukas
left a comment
Contributor
There was a problem hiding this comment.
Thanks for the fix, @zwarm . Both testing scenarios are working as expected and reverted code LGTM ![]()
12 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.


Fixes #19695
This PR reverts the use of MLKit for scanning QR Code as used by the web login. The reason for the revert is because the
stories-androidhas a dependency on camerax `1.0.0-alpha06' and the MLKit needs at least version '1.2.3'. We could not resolve the dependency via gradle :(.The entire
barcodescannerpackage had to be removed because the dependencies were nixed from build.gradle. Since the strings were already translated, I marked the resource as unused so they would not have to go through translation again.The plan is to update the
stories-androidto CameraX version1.2.3during the next hack weekcc: @oguzkocer
To Test:
Story Post
[JP] Scan Login Code - Success
(STOP)
Regression Notes
Potential unintended areas of impact
Stories still crash when launching camera
What I did to test those areas of impact (or what existing automated tests I relied on)
Manual testing
What automated tests I added (or what prevented me from doing so)
N/A
PR Submission Checklist:
RELEASE-NOTES.txtif necessary.UI Changes Testing Checklist: N/A