mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-03-22 15:52:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update zxing lib, to hopefully fix a an autobug

Browse Source
This commit is contained in:
geeksville
2020-04-12 16:11:16 -07:00
parent d1afb6fac6
commit 2c50f27d22
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/build.gradle
View File

@@ -134,8 +134,9 @@ dependencies {
// https://firebase.google.com/docs/android/setup#available-libraries
// barcode support
// implementation('com.google.zxing:core:3.4.0')
implementation('com.journeyapps:zxing-android-embedded:3.6.0')
// per https://github.com/journeyapps/zxing-android-embedded for support of android version 22
implementation('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false }
implementation 'com.google.zxing:core:3.3.0'
implementation project(':geeksville-androidlib')
}

3
app/src/main/AndroidManifest.xml
View File

@@ -4,6 +4,9 @@
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="GoogleAppIndexingWarning">
<!-- per https://github.com/journeyapps/zxing-android-embedded to force support for build 22 -->
<uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />