Merge branch 'master' into use-native-system-filepicker-for-opml-import

2 files changed, 2 insertions, 5 deletions

diff --git a/News-Android-App/build.gradle b/News-Android-App/build.gradle
index e3084dbe..45e4ad50 100644
--- a/News-Android-App/build.gradle
+++ b/News-Android-App/build.gradle
@@ -26,8 +26,6 @@ android {
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
         vectorDrawables.useSupportLibrary = true
-
-        multiDexEnabled true
     }
 
     buildFeatures {
@@ -185,7 +183,6 @@ dependencies {
     implementation "com.squareup.okhttp3:okhttp:${OKHTTP_VERSION}"
     implementation "com.squareup.okhttp3:logging-interceptor:${OKHTTP_VERSION}"
 
-    implementation 'androidx.multidex:multidex:2.0.1'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
     testImplementation 'junit:junit:4.13.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 156f3c13..e32f3d73 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 androidx.multidex.MultiDexApplication;
+import android.app.Application;
 
 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 MultiDexApplication {
+public class NewsReaderApplication extends Application {
 
     protected AppComponent mAppComponent;