From 200f8906d8565f0ac15f1b63b840ef264183a60b Mon Sep 17 00:00:00 2001 From: Isira Seneviratne Date: Wed, 15 Jul 2020 08:13:06 +0530 Subject: [PATCH] Enable support for Java 8 API desugaring. --- Source/Android/app/build.gradle | 5 +++++ Source/Android/build.gradle | 2 +- Source/Android/gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle index b86192129a25..0e84467163f2 100644 --- a/Source/Android/app/build.gradle +++ b/Source/Android/app/build.gradle @@ -4,6 +4,9 @@ android { compileSdkVersion 30 compileOptions { + // Flag to enable support for the new language APIs + coreLibraryDesugaringEnabled true + sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } @@ -76,6 +79,8 @@ android { } dependencies { + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.9' + implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.exifinterface:exifinterface:1.1.0' implementation 'androidx.cardview:cardview:1.0.0' diff --git a/Source/Android/build.gradle b/Source/Android/build.gradle index 3333dd49ac72..8d8b1e2d4fb1 100644 --- a/Source/Android/build.gradle +++ b/Source/Android/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.android.tools.build:gradle:4.0.0' } } diff --git a/Source/Android/gradle/wrapper/gradle-wrapper.properties b/Source/Android/gradle/wrapper/gradle-wrapper.properties index e972e5cc78dd..cfdbb2c3bb3c 100644 --- a/Source/Android/gradle/wrapper/gradle-wrapper.properties +++ b/Source/Android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip