Merge pull request #2521 from dimagi/revert-zxing-update

Revert zxing library update
dimagi · Aug 16, 2021 · b8b0359 · b8b0359
2 parents f2c0016 + d31d0dc
commit b8b0359
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
@@ -48,7 +48,7 @@
 
     <uses-sdk tools:overrideLibrary="com.dimagi.android.zebraprinttool, com.simprints.libsimprints,
     ru.noties.markwon.il, ru.noties.markwon.view, ru.noties.markwon.renderer,
-    com.google.firebase.crashlytics, com.google.firebase.iid, com.google.zxing.client.android"/>
+    com.google.firebase.crashlytics, com.google.firebase.iid"/>
 
     <permission-group
         android:name="commcare.permission-group.DATABASE"

diff --git a/app/build.gradle b/app/build.gradle
@@ -98,8 +98,7 @@ dependencies {
     implementation 'com.carrotsearch:hppc:0.7.2'
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
     implementation 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
-    implementation ('com.journeyapps:zxing-android-embedded:4.2.0') { transitive = false }
-    implementation 'com.google.zxing:core:3.3.0'
+    implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
     implementation 'com.google.firebase:firebase-analytics:17.5.0'
     implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
     implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'