From c0a8673e9f97fbeb565000fe85d2f1ce55f6e8c2 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 16 Sep 2020 10:21:33 -0300
Subject: Make apps work on API 21+ (except cashier that needs 23+)

---
 taler-kotlin-android/README.md                    | 6 ++++++
 taler-kotlin-android/build.gradle                 | 4 ++--
 taler-kotlin-android/src/main/AndroidManifest.xml | 3 +++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 taler-kotlin-android/README.md

(limited to 'taler-kotlin-android')

diff --git a/taler-kotlin-android/README.md b/taler-kotlin-android/README.md
new file mode 100644
index 0000000..c5273de
--- /dev/null
+++ b/taler-kotlin-android/README.md
@@ -0,0 +1,6 @@
+# GNU Taler Kotlin Library for Android
+
+This library provided basic GNU Taler functionality to Android apps. 
+
+Warning: If you use this library and need bar code scanning, please target at least SDK version 24
+         or set `coreLibraryDesugaringEnabled` to `true` in `android.compileOptions`.
diff --git a/taler-kotlin-android/build.gradle b/taler-kotlin-android/build.gradle
index acd2dc7..d06fde3 100644
--- a/taler-kotlin-android/build.gradle
+++ b/taler-kotlin-android/build.gradle
@@ -27,7 +27,7 @@ android {
     buildToolsVersion "$build_tools_version"
 
     defaultConfig {
-        minSdkVersion 24
+        minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
         versionName "0.1"
@@ -72,7 +72,7 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
     // QR codes
-    implementation 'com.google.zxing:core:3.4.0'  // needs minSdkVersion 24+
+    implementation 'com.google.zxing:core:3.4.0'  // needs minSdkVersion 24+ or desugar
 
     // Logcat viewer
     implementation('com.github.pedrovgs:lynx:1.1.0') {
diff --git a/taler-kotlin-android/src/main/AndroidManifest.xml b/taler-kotlin-android/src/main/AndroidManifest.xml
index 902ddc1..f74aae6 100644
--- a/taler-kotlin-android/src/main/AndroidManifest.xml
+++ b/taler-kotlin-android/src/main/AndroidManifest.xml
@@ -15,8 +15,11 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="net.taler.common">
 
+    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
+
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.NFC" />
-- 
cgit v1.2.3