From b4014eec64f8b7813acac0d16a87e205e147791e Mon Sep 17 00:00:00 2001 From: Emux Date: Thu, 1 Dec 2022 18:18:24 +0200 Subject: [PATCH] Update Android Gradle plugin (#988) --- build.gradle | 2 +- vtm-android-example/build.gradle | 10 ++++++---- vtm-app/build.gradle | 9 ++++++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 8d103300..da6b81f9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.android.application' version '7.2.2' apply false + id 'com.android.application' version '7.3.0' apply false } allprojects { diff --git a/vtm-android-example/build.gradle b/vtm-android-example/build.gradle index 08f1bb2e..1ebabcb8 100644 --- a/vtm-android-example/build.gradle +++ b/vtm-android-example/build.gradle @@ -55,12 +55,14 @@ android { release.setRoot('build-types/release') } - lintOptions { abortOnError false } + lint { + abortOnError false + } packagingOptions { - exclude 'META-INF/services/io.jeo.data.Driver' - exclude 'META-INF/LICENSE' - exclude 'META-INF/NOTICE' + resources { + excludes += ['META-INF/services/io.jeo.data.Driver', 'META-INF/LICENSE', 'META-INF/NOTICE'] + } } /*buildTypes { diff --git a/vtm-app/build.gradle b/vtm-app/build.gradle index 19acbd9c..e0209fd6 100644 --- a/vtm-app/build.gradle +++ b/vtm-app/build.gradle @@ -38,10 +38,13 @@ android { release.setRoot('build-types/release') } - lintOptions { abortOnError false } + lint { + abortOnError false + } packagingOptions { - exclude 'META-INF/LICENSE' - exclude 'META-INF/NOTICE' + resources { + excludes += ['META-INF/LICENSE', 'META-INF/NOTICE'] + } } }