From f5b6cccd32312c5c521217a7bb42ce0cbee83d52 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Tue, 15 Mar 2022 18:19:07 +0100 Subject: [PATCH 1/2] Android: Update Android Gradle Plugin --- Source/Android/app/build.gradle | 2 +- Source/Android/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle index e589b1a91d..4a3631101d 100644 --- a/Source/Android/app/build.gradle +++ b/Source/Android/app/build.gradle @@ -12,7 +12,7 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } - lintOptions { + lint { // This is important as it will run lint but not abort on error // Lint has some overly obnoxious "errors" that should really be warnings abortOnError false diff --git a/Source/Android/build.gradle b/Source/Android/build.gradle index ac31f01cf5..13780fbe5f 100644 --- a/Source/Android/build.gradle +++ b/Source/Android/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.android.tools.build:gradle:7.1.1' } } From f9f561ced167f59dda95a0dbc23f2ea56ec9b1df Mon Sep 17 00:00:00 2001 From: JosJuice Date: Tue, 15 Mar 2022 18:19:28 +0100 Subject: [PATCH 2/2] Android: Update dependencies --- Source/Android/app/build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle index 4a3631101d..158cc3ad6c 100644 --- a/Source/Android/app/build.gradle +++ b/Source/Android/app/build.gradle @@ -91,15 +91,15 @@ android { dependencies { coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' - implementation 'androidx.appcompat:appcompat:1.4.0' + implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.exifinterface:exifinterface:1.3.3' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.recyclerview:recyclerview:1.2.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.2' - implementation 'androidx.lifecycle:lifecycle-viewmodel:2.4.0' - implementation 'androidx.fragment:fragment:1.4.0' - implementation 'androidx.slidingpanelayout:slidingpanelayout:1.2.0-rc01' - implementation 'com.google.android.material:material:1.4.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + implementation 'androidx.lifecycle:lifecycle-viewmodel:2.4.1' + implementation 'androidx.fragment:fragment:1.4.1' + implementation 'androidx.slidingpanelayout:slidingpanelayout:1.2.0' + implementation 'com.google.android.material:material:1.5.0' // Android TV UI libraries. implementation 'androidx.leanback:leanback:1.0.0'