From 7f48d9b4a549710fb9d6bbdea9a5b2522925a204 Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Sun, 27 Dec 2020 15:43:36 +0100
Subject: [PATCH] Enable core library desugaring

---
 News-Android-App/build.gradle                               | 6 ++++++
 .../de/luhmer/owncloudnewsreader/NewsReaderApplication.java | 4 ++--
 gradle.properties                                           | 2 +-
 gradle/wrapper/gradle-wrapper.properties                    | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/News-Android-App/build.gradle b/News-Android-App/build.gradle
index a6798451..395565ea 100644
--- a/News-Android-App/build.gradle
+++ b/News-Android-App/build.gradle
@@ -26,6 +26,8 @@ android {
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
         vectorDrawables.useSupportLibrary = true
+
+        multiDexEnabled true
     }
 
     testOptions {
@@ -35,6 +37,7 @@ android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
+        coreLibraryDesugaringEnabled true
     }
 
     buildTypes {
@@ -189,6 +192,9 @@ dependencies {
 
     implementation 'com.nbsp:library:1.8' // MaterialFilePicker
 
+    implementation 'androidx.multidex:multidex:2.0.1'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
+
     //extraImplementation 'com.github.tommus:youtube-android-player-api:1.2.2'
 
 
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderApplication.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderApplication.java
index e32f3d73..156f3c13 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderApplication.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderApplication.java
@@ -1,6 +1,6 @@
 package de.luhmer.owncloudnewsreader;
 
-import android.app.Application;
+import androidx.multidex.MultiDexApplication;
 
 import de.luhmer.owncloudnewsreader.di.ApiModule;
 import de.luhmer.owncloudnewsreader.di.AppComponent;
@@ -8,7 +8,7 @@ import de.luhmer.owncloudnewsreader.di.DaggerAppComponent;
 import de.luhmer.owncloudnewsreader.helper.AdBlocker;
 import de.luhmer.owncloudnewsreader.helper.ForegroundListener;
 
-public class NewsReaderApplication extends Application {
+public class NewsReaderApplication extends MultiDexApplication {
 
     protected AppComponent mAppComponent;
 
diff --git a/gradle.properties b/gradle.properties
index c42d48ea..afba4dd4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,7 +17,7 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-ANDROID_BUILD_MIN_SDK_VERSION=17
+ANDROID_BUILD_MIN_SDK_VERSION=18
 ANDROID_BUILD_TARGET_SDK_VERSION=29
 ANDROID_BUILD_SDK_VERSION=29
 android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 969439c0..871ed14b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Dec 04 19:59:05 CET 2020
+#Sun Dec 27 15:28:12 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip