aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2021-02-19 19:29:57 +0530
committerHarsh Shandilya <me@msfjarvis.dev>2021-02-19 19:30:17 +0530
commit617be576f8a1bc41ec0b32ea57c84e44626b7352 (patch)
treec7d0f749e06f923353b7b07bf4e6c4b0bde4289c
parenttunnel: report git commit as wgVersion (diff)
downloadwireguard-android-617be576f8a1bc41ec0b32ea57c84e44626b7352.tar.xz
wireguard-android-617be576f8a1bc41ec0b32ea57c84e44626b7352.zip
build: upgrade to ZXING 4.1.0
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
-rw-r--r--build.gradle2
-rw-r--r--ui/src/main/AndroidManifest.xml5
2 files changed, 5 insertions, 2 deletions
diff --git a/build.gradle b/build.gradle
index 76bbcb05..807a878f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
lifecycleRuntimeKtxVersion = '2.3.0'
materialComponentsVersion = '1.3.0'
preferenceVersion = '1.1.1'
- zxingEmbeddedVersion = '3.6.0'
+ zxingEmbeddedVersion = '4.1.0'
groupName = 'com.wireguard.android'
}
diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml
index 56e7184c..ce527498 100644
--- a/ui/src/main/AndroidManifest.xml
+++ b/ui/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
android:name="android.software.leanback"
android:required="false" />
<uses-feature
- android:name="android.hardware.camera"
+ android:name="android.hardware.camera.any"
android:required="false" />
<permission
@@ -29,6 +29,9 @@
android:label="@string/permission_label"
android:protectionLevel="dangerous" />
+ <!-- This is safe to override, the APIs we use work perfectly fine on Android 6 -->
+ <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
+
<application
android:name=".Application"
android:allowBackup="false"