diff options
-rw-r--r-- | News-Android-App/build.gradle | 6 | ||||
-rw-r--r-- | News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderApplication.java | 4 | ||||
-rw-r--r-- | News-Android-App/src/main/res/values-fr/strings.xml | 1 | ||||
-rw-r--r-- | News-Android-App/src/main/res/values-nl/strings.xml | 2 | ||||
-rw-r--r-- | gradle.properties | 2 | ||||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 |
6 files changed, 14 insertions, 5 deletions
diff --git a/News-Android-App/build.gradle b/News-Android-App/build.gradle index 2dedcb25..48a60bc2 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 } buildFeatures { @@ -39,6 +41,7 @@ android { compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 + coreLibraryDesugaringEnabled true } buildTypes { @@ -191,6 +194,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/News-Android-App/src/main/res/values-fr/strings.xml b/News-Android-App/src/main/res/values-fr/strings.xml index dfa290bf..22598be0 100644 --- a/News-Android-App/src/main/res/values-fr/strings.xml +++ b/News-Android-App/src/main/res/values-fr/strings.xml @@ -173,6 +173,7 @@ <string name="pref_contribute">Contribuez !</string> <string name="pref_contribute_summary">Obtenir le code source</string> <string name="pref_privacy">Vie privée</string> + <string name="pref_privacy_summary">Politique de confidentialité de Nextcloud News pour Android</string> <string name="pref_version">Application Android NextCloud News</string> diff --git a/News-Android-App/src/main/res/values-nl/strings.xml b/News-Android-App/src/main/res/values-nl/strings.xml index 50592b99..5fa4e851 100644 --- a/News-Android-App/src/main/res/values-nl/strings.xml +++ b/News-Android-App/src/main/res/values-nl/strings.xml @@ -172,6 +172,8 @@ <string name="pref_report_issue_summary">Vereist een (gratis) GitHub account</string> <string name="pref_contribute">Bijdragen!</string> <string name="pref_contribute_summary">Download de broncode</string> + <string name="pref_privacy">Privacy</string> + <string name="pref_privacy_summary">Nextcloud News Android Privacy Policy</string> <string name="pref_version">Nextcloud Nieuws Android app</string> 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 15b7ab74..969439c0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Dec 27 15:57:12 CET 2020 +#Fri Dec 04 19:59:05 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-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip |