Upgraded Android Gradle plugin to 7.1.2

federicoiosue · Mar 7, 2022 · a712130 · a712130
1 parent 1949107
commit a712130
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.1'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.0"
         classpath 'com.adarshr:gradle-test-logger-plugin:2.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

diff --git a/omniNotes/build.gradle b/omniNotes/build.gradle
@@ -57,12 +57,13 @@ android {
         unitTests.returnDefaultValues = true
         animationsDisabled = true
     }
-
     packagingOptions {
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/NOTICE.txt'
+        resources {
+            excludes += ['META-INF/LICENSE.txt', 'META-INF/NOTICE.txt']
+        }
     }
 
+
     buildTypes {
         debug {
             testCoverageEnabled true
@@ -102,10 +103,6 @@ android {
         }
     }
 
-    lintOptions {
-        abortOnError false
-        disable 'MissingTranslation'
-    }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
@@ -115,6 +112,10 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_11
     }
+    lint {
+        abortOnError false
+        disable 'MissingTranslation'
+    }
 }
 
 dependencies {