Update verification-metadata.xml for MLKit dependencies
- Update tests to use the latest MLKit
- Update verification-metadata.xml for MLKit dependencies
Bug: 198984186
Test: manual test and ./gradlew bOS
Change-Id: I1cbd9bfffe7e3b5b22a28b205b2ab299569eb48d
diff --git a/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/MLKitBarcodeTest.kt b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/MLKitBarcodeTest.kt
index 1ce4f73..614ba47 100644
--- a/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/MLKitBarcodeTest.kt
+++ b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/MLKitBarcodeTest.kt
@@ -30,7 +30,7 @@
import androidx.test.core.app.ApplicationProvider
import androidx.test.filters.LargeTest
import com.google.common.truth.Truth.assertWithMessage
-import com.google.mlkit.vision.barcode.Barcode.FORMAT_QR_CODE
+import com.google.mlkit.vision.barcode.common.Barcode.FORMAT_QR_CODE
import com.google.mlkit.vision.barcode.BarcodeScanner
import com.google.mlkit.vision.barcode.BarcodeScannerOptions
import com.google.mlkit.vision.barcode.BarcodeScanning
diff --git a/camera/integration-tests/viewtestapp/build.gradle b/camera/integration-tests/viewtestapp/build.gradle
index af70c26..c1ae9e8 100644
--- a/camera/integration-tests/viewtestapp/build.gradle
+++ b/camera/integration-tests/viewtestapp/build.gradle
@@ -62,6 +62,7 @@
implementation(project(":camera:camera-view"))
implementation(libs.guavaAndroid)
implementation("androidx.exifinterface:exifinterface:1.3.2")
+ implementation(libs.mlkitBarcode, excludes.mlkit)
// old version of common-java8 conflicts with newer version, because both have
// DefaultLifecycleEventObserver.
// Outside of androidx this is resolved via constraint added to lifecycle-common,
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ac44bf6..03b11c3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -134,7 +134,7 @@
leakcanaryInstrumentation = { module = "com.squareup.leakcanary:leakcanary-android-instrumentation", version.ref = "leakcanary" }
material = { module = "com.google.android.material:material", version = "1.2.1" }
metalava = { module = "com.android.tools.metalava:metalava", version = "1.0.0-alpha05" }
-mlkitBarcode = { module = "com.google.mlkit:barcode-scanning", version = "16.1.1" }
+mlkitBarcode = { module = "com.google.mlkit:barcode-scanning", version = "17.0.2" }
mockitoCore = { module = "org.mockito:mockito-core", version.ref = "mockito" }
mockitoAndroid = { module = "org.mockito:mockito-android", version.ref = "mockito" }
mockitoKotlin = { module = "com.nhaarman.mockitokotlin2:mockito-kotlin", version = "2.1.0" }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 7552c20..839a0bb 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -370,6 +370,14 @@
<sha256 value="49a7601d17798078a39ecd3cc2cae8dcc3c87b4ab0c156ccbe34cc84f7b36e95" origin="Generated by Gradle"/>
</artifact>
</component>
+ <component group="com.google.android.datatransport" name="transport-backend-cct" version="2.3.3">
+ <artifact name="transport-backend-cct-2.3.3.aar">
+ <sha256 value="b22a14d560a590dc875e902424b29a13a02d1faf297b7c39a9007967ffadccbd" origin="Generated by Gradle"/>
+ </artifact>
+ <artifact name="transport-backend-cct-2.3.3.pom">
+ <sha256 value="ab4e3c8df8bb695d6466df399f4c2e0da977c04d2fdea8a34ee51281683175b0" origin="Generated by Gradle"/>
+ </artifact>
+ </component>
<component group="com.google.android.datatransport" name="transport-runtime" version="2.2.5">
<artifact name="transport-runtime-2.2.5.aar">
<sha256 value="a00159158918ae582c2c859df1f43af9ab322346a293ebab5f65f0e5e4bdc865" origin="Generated by Gradle"/>
@@ -378,6 +386,14 @@
<sha256 value="3a86c974e79d79a55eeaf9aa65ac30fa63768a4efaceb17446f9e68aed59a590" origin="Generated by Gradle"/>
</artifact>
</component>
+ <component group="com.google.android.datatransport" name="transport-runtime" version="2.2.6">
+ <artifact name="transport-runtime-2.2.6.aar">
+ <sha256 value="d83ad23c134429691161c92476a3c83df236cd1f8badbfd4f00723b4eccd741c" origin="Generated by Gradle"/>
+ </artifact>
+ <artifact name="transport-runtime-2.2.6.pom">
+ <sha256 value="aff04e2de298277827d2031cc265b5a28a030e54210a9ba3a018aa0859d29589" origin="Generated by Gradle"/>
+ </artifact>
+ </component>
<component group="com.google.android.material" name="material" version="1.0.0">
<artifact name="material-1.0.0.aar">
<sha256 value="7680e381a3c03798d999b2e441caadd8a56a0a808e108024a67af9fe26c11adc" origin="Generated by Gradle"/>
@@ -404,6 +420,14 @@
<sha256 value="d6a8c8f3e0e2544d53e3941a6e508c9a6397a75f3c4ed7a418360fad09d1557a" origin="Generated by Gradle"/>
</artifact>
</component>
+ <component group="com.google.android.odml" name="image" version="1.0.0-beta1">
+ <artifact name="image-1.0.0-beta1.aar">
+ <sha256 value="2e71aa31f83a9415277f119de67195726f07d1760e9542c111778c320e3aa1f2" origin="Generated by Gradle"/>
+ </artifact>
+ <artifact name="image-1.0.0-beta1.pom">
+ <sha256 value="795f4793c375eedf4332a0381082981a5ce70b7a0a776221ca24ad9d40cbea1c" origin="Generated by Gradle"/>
+ </artifact>
+ </component>
<component group="com.google.android.play" name="core" version="1.10.2">
<artifact name="core-1.10.2.aar">
<sha256 value="6b0c277c450b200f937837d55716d769263db9ed53165739207bc123c3e70420" origin="Generated by Gradle"/>
@@ -438,6 +462,14 @@
<sha256 value="02c12c3c2ae12dd475219ff691c82a4d9ea21f44bc594a181295bf6d43dcfbb0" origin="Generated by Gradle"/>
</artifact>
</component>
+ <component group="com.google.firebase" name="firebase-annotations" version="16.0.0">
+ <artifact name="firebase-annotations-16.0.0.jar">
+ <sha256 value="8830f2e8a5e434cbc5e4bd18133073b6e8518a8ce8ec2ce6f3b273c91d9664c2" origin="Generated by Gradle"/>
+ </artifact>
+ <artifact name="firebase-annotations-16.0.0.pom">
+ <sha256 value="82c6d040edcb3c158b5b9865601d2bd742abcbd97cbd98903bde059da8edd087" origin="Generated by Gradle"/>
+ </artifact>
+ </component>
<component group="com.google.firebase" name="firebase-appindexing" version="20.0.0">
<artifact name="firebase-appindexing-20.0.0.aar">
<sha256 value="c07aee785d8e0644f38895955f6d4e8808bb43f44c5660b05ff4b828700ac96c" origin="Generated by Gradle"/>
@@ -456,6 +488,14 @@
<sha256 value="5c5d0a5f811e4eb7512ea7aba70241ebeb27b9e195fbdea9b2c4b914272c326e" origin="Generated by Gradle"/>
</artifact>
</component>
+ <component group="com.google.firebase" name="firebase-components" version="16.1.0">
+ <artifact name="firebase-components-16.1.0.aar">
+ <sha256 value="82e91aa5ed186eedaf1f2210f5d241ba6e4456cf0c32949d5cdbe152b0e2e88b" origin="Generated by Gradle"/>
+ </artifact>
+ <artifact name="firebase-components-16.1.0.pom">
+ <sha256 value="8320c67176d416edcf58b65b2ef491b42faa1360f3cd7bf3d8c2eea4298ae70e" origin="Generated by Gradle"/>
+ </artifact>
+ </component>
<component group="com.google.firebase" name="firebase-encoders" version="16.1.0">
<artifact name="firebase-encoders-16.1.0.jar">
<sha256 value="8f89a74298bbccc2c543385208a2f0c67f603ce67e6ec21cc772e98e688f7cf5" origin="Generated by Gradle"/>
@@ -533,6 +573,22 @@
<sha256 value="670a7a462b79dbd256b3678a658d538ea9483daa094842b93b35ff4d9399a150" origin="Generated by Gradle"/>
</artifact>
</component>
+ <component group="com.google.mlkit" name="barcode-scanning" version="17.0.2">
+ <artifact name="barcode-scanning-17.0.2.aar">
+ <sha256 value="820eb9cae45cff1e8e0d0ba2fd191732a892502d85fd526aa3d764a624346402" origin="Generated by Gradle"/>
+ </artifact>
+ <artifact name="barcode-scanning-17.0.2.pom">
+ <sha256 value="8f23bd28de22b3bf65bcc5ea24497090b233081af0d4253333059964ec1d3d45" origin="Generated by Gradle"/>
+ </artifact>
+ </component>
+ <component group="com.google.mlkit" name="barcode-scanning-common" version="17.0.0">
+ <artifact name="barcode-scanning-common-17.0.0.aar">
+ <sha256 value="cd0e9e71b834078d4a8a7f09e72d7d7c3a22e258e9602da7ac86146677043f14" origin="Generated by Gradle"/>
+ </artifact>
+ <artifact name="barcode-scanning-common-17.0.0.pom">
+ <sha256 value="f5caf8b670a7f048c13ee637536f21da52b59b4f2218081df320986a6e3ad3b4" origin="Generated by Gradle"/>
+ </artifact>
+ </component>
<component group="com.google.mlkit" name="common" version="17.1.1">
<artifact name="common-17.1.1.aar">
<sha256 value="3305216ffcc50b7dce512ad558f48cf5156f6275750dea4890a3db8f46a89dbb" origin="Generated by Gradle"/>
@@ -541,6 +597,14 @@
<sha256 value="f313723aefb55634b0a780a4967b61f2c188eaf3b638ee313b9f04c4dff0238c" origin="Generated by Gradle"/>
</artifact>
</component>
+ <component group="com.google.mlkit" name="common" version="18.0.0">
+ <artifact name="common-18.0.0.aar">
+ <sha256 value="40b8897359b63503f8b6ad531ed0737ae51edf0db747ea57badb09052c99283e" origin="Generated by Gradle"/>
+ </artifact>
+ <artifact name="common-18.0.0.pom">
+ <sha256 value="e69be8b3145078ee3acbed8151db39aa166e4cc8287ffa6a72470d6323f5a790" origin="Generated by Gradle"/>
+ </artifact>
+ </component>
<component group="com.google.mlkit" name="vision-common" version="16.3.0">
<artifact name="vision-common-16.3.0.aar">
<sha256 value="4687d90f2026011fbc38f6979a141997f6cb831ca8f9f2ebfd0daa3cc6468a13" origin="Generated by Gradle"/>
@@ -549,6 +613,22 @@
<sha256 value="26fd2c8522da770ce7c3317e82597deb823e9256aaa2c93a68115d10f478600d" origin="Generated by Gradle"/>
</artifact>
</component>
+ <component group="com.google.mlkit" name="vision-common" version="17.0.0">
+ <artifact name="vision-common-17.0.0.aar">
+ <sha256 value="0f173b3ce33c67b9097c2ce7dbf0db922bcabca5b4e4eab93fa19ca70b036c88" origin="Generated by Gradle"/>
+ </artifact>
+ <artifact name="vision-common-17.0.0.pom">
+ <sha256 value="479110f1ea8aedbef6d0e1ba8b49d826de03778dca670370da693bbc5b6c18ac" origin="Generated by Gradle"/>
+ </artifact>
+ </component>
+ <component group="com.google.mlkit" name="vision-interfaces" version="16.0.0">
+ <artifact name="vision-interfaces-16.0.0.aar">
+ <sha256 value="0ba58e01f36ce989f4fd249b480be763a87d553911f7a738496aa18274b5c97d" origin="Generated by Gradle"/>
+ </artifact>
+ <artifact name="vision-interfaces-16.0.0.pom">
+ <sha256 value="02c897017d46c8436f45d2f84a353b49344d6460016abee57325a0ac85ebd154" origin="Generated by Gradle"/>
+ </artifact>
+ </component>
<!-- Unsigned -->
<component group="com.google.prefab" name="cli" version="2.0.0">
<artifact name="cli-2.0.0-all.jar">
