From a386e3a3d294ef7994a0b216ea867572581230e9 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 21 Mar 2023 15:30:38 +0100
Subject: [PATCH] build: update to gradle 7.4.2 and restructure lint block

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 settings.gradle     | 2 +-
 tunnel/build.gradle | 5 ++---
 ui/build.gradle     | 7 +++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 2a030305..e6dd51a5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
 pluginManagement {
-    def agpVersion = "7.4.0"
+    def agpVersion = '7.4.2'
     def kotlinVersion = "1.8.0"
     repositories {
         gradlePluginPortal()
diff --git a/tunnel/build.gradle b/tunnel/build.gradle
index e1742f4c..da15770b 100644
--- a/tunnel/build.gradle
+++ b/tunnel/build.gradle
@@ -45,9 +45,8 @@ android {
             }
         }
     }
-    lintOptions {
-        disable('LongLogTag')
-        disable('NewApi') // Desugaring!
+    lint {
+        disable 'LongLogTag', 'NewApi'
     }
 }
 
diff --git a/ui/build.gradle b/ui/build.gradle
index e95d1779..94bbf786 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -56,10 +56,9 @@ android {
             versionNameSuffix "-debug"
         }
     }
-    lintOptions {
-        disable('LongLogTag')
-        warning('MissingTranslation')
-        warning('ImpliedQuantity')
+    lint {
+        disable 'LongLogTag'
+        warning 'MissingTranslation', 'ImpliedQuantity'
     }
 }