From aff7cf4390ccf4eb55128931eb2276ac4963a5e9 Mon Sep 17 00:00:00 2001 From: Fredia Huya-Kouadio Date: Wed, 28 Oct 2020 12:43:35 -0700 Subject: Update the gradle plugins --- platform/android/java/app/config.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'platform/android/java/app') diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle index d1176e6196..d9e110b0bd 100644 --- a/platform/android/java/app/config.gradle +++ b/platform/android/java/app/config.gradle @@ -1,11 +1,11 @@ ext.versions = [ - androidGradlePlugin: '3.5.3', + androidGradlePlugin: '4.1.0', compileSdk : 29, minSdk : 18, targetSdk : 29, - buildTools : '29.0.3', + buildTools : '30.0.1', supportCoreUtils : '1.0.0', - kotlinVersion : '1.3.61', + kotlinVersion : '1.4.10', v4Support : '1.0.0' ] -- cgit v1.2.3 From edf762fba6b305771191b706e4d097f7b5285360 Mon Sep 17 00:00:00 2001 From: Fredia Huya-Kouadio Date: Wed, 28 Oct 2020 16:32:45 -0700 Subject: Add a separate `nativeSrcsConfigs` module to handle Android Studio constraints for native code editor support. --- platform/android/java/app/build.gradle | 4 ++-- platform/android/java/app/config.gradle | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'platform/android/java/app') diff --git a/platform/android/java/app/build.gradle b/platform/android/java/app/build.gradle index ceacfec9e1..6de1d2dd30 100644 --- a/platform/android/java/app/build.gradle +++ b/platform/android/java/app/build.gradle @@ -70,8 +70,8 @@ android { buildToolsVersion versions.buildTools compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility versions.javaVersion + targetCompatibility versions.javaVersion } defaultConfig { diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle index d9e110b0bd..e6c45b73a7 100644 --- a/platform/android/java/app/config.gradle +++ b/platform/android/java/app/config.gradle @@ -6,7 +6,8 @@ ext.versions = [ buildTools : '30.0.1', supportCoreUtils : '1.0.0', kotlinVersion : '1.4.10', - v4Support : '1.0.0' + v4Support : '1.0.0', + javaVersion : 1.8 ] -- cgit v1.2.3