From 4221d299ce6f05decb57798bfec6a2100743338a Mon Sep 17 00:00:00 2001
From: Julian Raufelder <Julian@Raufelder.com>
Date: Wed, 26 Jan 2022 10:32:55 +0100
Subject: [PATCH] Update Gradle to version 7.2

---
 .idea/misc.xml                           | 13 +++++++++++--
 build.gradle                             |  2 +-
 buildsystem/dependencies.gradle          |  2 +-
 data/build.gradle                        | 17 +++++++++--------
 domain/build.gradle                      |  6 +++---
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 presentation/build.gradle                | 18 +++++++++---------
 util/build.gradle                        | 19 ++++++++++++-------
 8 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7dccb165..1d3e3ba7 100755
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="presentation/src/main/res/drawable/ic_lock.xml" value="0.1962962962962963" />
+        <entry key="presentation/src/main/res/layout/dialog_app_update.xml" value="0.36614583333333334" />
+      </map>
+    </option>
+  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" />
@@ -26,7 +34,7 @@
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="14">
+        <list size="15">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
@@ -41,11 +49,12 @@
           <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
           <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
           <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
+          <item index="14" class="java.lang.String" itemvalue="lombok.NonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/build.gradle b/build.gradle
index 386f17da..e8063c7f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 		google()
 	}
 	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'
 		classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.16.0'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle
index a12e59f0..db3b501f 100644
--- a/buildsystem/dependencies.gradle
+++ b/buildsystem/dependencies.gradle
@@ -19,7 +19,7 @@ allprojects {
 }
 
 ext {
-	androidBuildToolsVersion = "30.0.2"
+	androidBuildToolsVersion = "30.0.3"
 	androidMinSdkVersion = 26
 	androidTargetSdkVersion = 30
 	androidCompileSdkVersion = 30
diff --git a/data/build.gradle b/data/build.gradle
index d401ab6a..ccc9b45c 100644
--- a/data/build.gradle
+++ b/data/build.gradle
@@ -28,11 +28,6 @@ android {
 		coreLibraryDesugaringEnabled true
 	}
 
-	lintOptions {
-		quiet true
-		abortOnError false
-		ignoreWarnings true
-	}
 
 	buildTypes {
 		release {
@@ -75,10 +70,16 @@ android {
 			java.srcDirs = ['src/main/java', 'src/main/java/', 'src/foss/java', 'src/foss/java/']
 		}
 	}
-
 	packagingOptions {
-		exclude 'META-INF/DEPENDENCIES'
-		exclude 'META-INF/NOTICE.md'
+		resources {
+			excludes += ['META-INF/DEPENDENCIES', 'META-INF/NOTICE.md']
+		}
+	}
+
+	lint {
+		abortOnError false
+		ignoreWarnings true
+		quiet true
 	}
 }
 
diff --git a/domain/build.gradle b/domain/build.gradle
index 9bc1cd3f..ef0b1bc2 100644
--- a/domain/build.gradle
+++ b/domain/build.gradle
@@ -26,12 +26,12 @@ android {
 
 		coreLibraryDesugaringEnabled true
 	}
-
-	lintOptions {
-		quiet true
+	lint {
 		abortOnError false
 		ignoreWarnings true
+		quiet true
 	}
+
 }
 
 dependencies {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0f80bbf5..ffed3a25 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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/presentation/build.gradle b/presentation/build.gradle
index 3d63162c..43b5e91e 100644
--- a/presentation/build.gradle
+++ b/presentation/build.gradle
@@ -39,11 +39,6 @@ android {
 		coreLibraryDesugaringEnabled true
 	}
 
-	lintOptions {
-		quiet true
-		abortOnError false
-		ignoreWarnings true
-	}
 
 	buildTypes {
 		release {
@@ -108,11 +103,16 @@ android {
 			java.srcDirs = ['src/main/java', 'src/main/java/', 'src/foss/java', 'src/foss/java/']
 		}
 	}
-
 	packagingOptions {
-		exclude 'META-INF/jersey-module-version'
-		exclude 'META-INF/NOTICE.md'
-		exclude 'META-INF/DEPENDENCIES'
+		resources {
+			excludes += ['META-INF/jersey-module-version', 'META-INF/NOTICE.md', 'META-INF/DEPENDENCIES']
+		}
+	}
+
+	lint {
+		abortOnError false
+		ignoreWarnings true
+		quiet true
 	}
 }
 
diff --git a/util/build.gradle b/util/build.gradle
index b2dbdbf0..93407bdd 100644
--- a/util/build.gradle
+++ b/util/build.gradle
@@ -24,15 +24,20 @@ android {
 		sourceCompatibility JavaVersion.VERSION_1_8
 		targetCompatibility JavaVersion.VERSION_1_8
 	}
-
-	lintOptions {
-		quiet true
-		abortOnError false
-		ignoreWarnings true
+	packagingOptions {
+		jniLibs {
+			pickFirsts += ['META-INF/*']
+		}
+		resources {
+			pickFirsts += ['META-INF/*']
+		}
 	}
 
-	packagingOptions {
-		pickFirst 'META-INF/*'
+
+	lint {
+		abortOnError false
+		ignoreWarnings true
+		quiet true
 	}
 }