wbrawner/news-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable core library desugaring

Browse source
This commit is contained in:
Stefan Niedermann 2020-12-27 15:43:36 +01:00
parent 3f8032247e
commit 7f48d9b4a5
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
News-Android-App/build.gradle
View file

@ -26,6 +26,8 @@ android {
testInstrumentationRunnerArguments clearPackageData: 'true' testInstrumentationRunnerArguments clearPackageData: 'true'
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
multiDexEnabled true
} }
testOptions { testOptions {
@ -35,6 +37,7 @@ android {
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
coreLibraryDesugaringEnabled true
} }
buildTypes { buildTypes {
@ -189,6 +192,9 @@ dependencies {
implementation 'com.nbsp:library:1.8' // MaterialFilePicker 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' //extraImplementation 'com.github.tommus:youtube-android-player-api:1.2.2'

4
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderApplication.java
View file

@ -1,6 +1,6 @@
package de.luhmer.owncloudnewsreader; package de.luhmer.owncloudnewsreader;
import android.app.Application; import androidx.multidex.MultiDexApplication;
import de.luhmer.owncloudnewsreader.di.ApiModule; import de.luhmer.owncloudnewsreader.di.ApiModule;
import de.luhmer.owncloudnewsreader.di.AppComponent; 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.AdBlocker;
import de.luhmer.owncloudnewsreader.helper.ForegroundListener; import de.luhmer.owncloudnewsreader.helper.ForegroundListener;
public class NewsReaderApplication extends Application { public class NewsReaderApplication extends MultiDexApplication {
protected AppComponent mAppComponent; protected AppComponent mAppComponent;

2
gradle.properties
View file

@ -17,7 +17,7 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true # org.gradle.parallel=true
ANDROID_BUILD_MIN_SDK_VERSION=17 ANDROID_BUILD_MIN_SDK_VERSION=18
ANDROID_BUILD_TARGET_SDK_VERSION=29 ANDROID_BUILD_TARGET_SDK_VERSION=29
ANDROID_BUILD_SDK_VERSION=29 ANDROID_BUILD_SDK_VERSION=29
android.useAndroidX=true android.useAndroidX=true

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Fri Dec 04 19:59:05 CET 2020 #Sun Dec 27 15:28:12 CET 2020
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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