From eb008d44517c45aab3ccdb74bcbe0a647cef569e Mon Sep 17 00:00:00 2001
From: Sven Fischer <git-dev@linux4tw.de>
Date: Tue, 1 Feb 2022 22:49:18 +0100
Subject: [PATCH] update gradle to 7.1.0 and gradle wrapper to 7.2, migrate
 lintOptions and packagingOptions

---
 app/build.gradle                         | 13 +++++++------
 build.gradle                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 19c22746..8a567775 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,15 +17,13 @@ android {
             }
         }
     }
-
-    lintOptions {
-        lintConfig file("lint.xml")
-    }
-
     packagingOptions {
-        exclude("META-INF/*.kotlin_module")
+        resources {
+            excludes += ['META-INF/*.kotlin_module']
+        }
     }
 
+
     buildTypes {
         release {
             minifyEnabled false
@@ -45,6 +43,9 @@ android {
             }
         }
     }
+    lint {
+        lintConfig file('lint.xml')
+    }
 }
 
 greendao {
diff --git a/build.gradle b/build.gradle
index ca832523..1773f315 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.1.0'
         classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0'
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 29e41345..a0f7639f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists