From ee1b41c3324bb87f6355a45abcd95b36eca198f8 Mon Sep 17 00:00:00 2001
From: Dave Snabel-Caunt <dave.snabel-caunt@thetradedesk.com>
Date: Mon, 9 Sep 2024 13:52:34 +0100
Subject: [PATCH] Use Suppress annotation rather than lint baselines

---
 dev-app/lint-baseline.xml                           | 10 +++++-----
 .../java/com/uid2/dev/utils/PackageManagerEx.kt     |  1 +
 securesignals-gma-dev-app/build.gradle              |  1 -
 securesignals-gma-dev-app/lint-baseline.xml         | 13 +------------
 .../java/com/uid2/dev/utils/PackageManagerEx.kt     |  1 +
 securesignals-ima-dev-app/build.gradle              |  1 -
 securesignals-ima-dev-app/lint-baseline.xml         | 13 +------------
 .../java/com/uid2/dev/utils/PackageManagerEx.kt     |  1 +
 8 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/dev-app/lint-baseline.xml b/dev-app/lint-baseline.xml
index f71c200..eea8e2a 100644
--- a/dev-app/lint-baseline.xml
+++ b/dev-app/lint-baseline.xml
@@ -4,12 +4,12 @@
     <issue
         id="WrongConstant"
         message="Must be one or more of: PackageManager.GET_META_DATA, PackageManager.GET_SHARED_LIBRARY_FILES, PackageManager.MATCH_UNINSTALLED_PACKAGES, PackageManager.MATCH_SYSTEM_ONLY, PackageManager.MATCH_DISABLED_COMPONENTS, PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS, PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS, PackageManager.GET_UNINSTALLED_PACKAGES, PackageManager.MATCH_APEX"
-        errorLine1="        getApplicationInfo(packageName, PackageManager.ApplicationInfoFlags.of(flags.toLong()))"
-        errorLine2="                                                                               ~~~~~~~~~~~~~~">
+        errorLine1="                getApplicationInfo(packageName, PackageManager.ApplicationInfoFlags.of(flags.toLong()))"
+        errorLine2="                                                                                       ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/uid2/dev/utils/PackageManagerEx.kt"
-            line="9"
-            column="80"/>
+            file="src/main/java/com/uid2/dev/network/AppUID2Client.kt"
+            line="202"
+            column="88"/>
     </issue>
 
 </issues>
diff --git a/dev-app/src/main/java/com/uid2/dev/utils/PackageManagerEx.kt b/dev-app/src/main/java/com/uid2/dev/utils/PackageManagerEx.kt
index 274d3bf..e4f930c 100644
--- a/dev-app/src/main/java/com/uid2/dev/utils/PackageManagerEx.kt
+++ b/dev-app/src/main/java/com/uid2/dev/utils/PackageManagerEx.kt
@@ -6,6 +6,7 @@ import android.os.Build
 
 fun PackageManager.getApplicationInfoCompat(packageName: String, flags: Int = 0): ApplicationInfo =
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        @Suppress("WrongConstant")
         getApplicationInfo(packageName, PackageManager.ApplicationInfoFlags.of(flags.toLong()))
     } else {
         @Suppress("DEPRECATION")
diff --git a/securesignals-gma-dev-app/build.gradle b/securesignals-gma-dev-app/build.gradle
index de31c02..8852cd3 100644
--- a/securesignals-gma-dev-app/build.gradle
+++ b/securesignals-gma-dev-app/build.gradle
@@ -23,7 +23,6 @@ android {
     }
 
     lint {
-        baseline = file("lint-baseline.xml")
         disable 'GradleDependency'
     }
 
diff --git a/securesignals-gma-dev-app/lint-baseline.xml b/securesignals-gma-dev-app/lint-baseline.xml
index f71c200..f418c4a 100644
--- a/securesignals-gma-dev-app/lint-baseline.xml
+++ b/securesignals-gma-dev-app/lint-baseline.xml
@@ -1,15 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.6.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0)" variant="all" version="8.6.0">
-
-    <issue
-        id="WrongConstant"
-        message="Must be one or more of: PackageManager.GET_META_DATA, PackageManager.GET_SHARED_LIBRARY_FILES, PackageManager.MATCH_UNINSTALLED_PACKAGES, PackageManager.MATCH_SYSTEM_ONLY, PackageManager.MATCH_DISABLED_COMPONENTS, PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS, PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS, PackageManager.GET_UNINSTALLED_PACKAGES, PackageManager.MATCH_APEX"
-        errorLine1="        getApplicationInfo(packageName, PackageManager.ApplicationInfoFlags.of(flags.toLong()))"
-        errorLine2="                                                                               ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/uid2/dev/utils/PackageManagerEx.kt"
-            line="9"
-            column="80"/>
-    </issue>
+<issues format="6" by="lint 7.4.2" type="baseline" client="gradle" dependencies="true" name="AGP (7.4.2)" variant="all" version="7.4.2">
 
 </issues>
diff --git a/securesignals-gma-dev-app/src/main/java/com/uid2/dev/utils/PackageManagerEx.kt b/securesignals-gma-dev-app/src/main/java/com/uid2/dev/utils/PackageManagerEx.kt
index 274d3bf..e4f930c 100644
--- a/securesignals-gma-dev-app/src/main/java/com/uid2/dev/utils/PackageManagerEx.kt
+++ b/securesignals-gma-dev-app/src/main/java/com/uid2/dev/utils/PackageManagerEx.kt
@@ -6,6 +6,7 @@ import android.os.Build
 
 fun PackageManager.getApplicationInfoCompat(packageName: String, flags: Int = 0): ApplicationInfo =
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        @Suppress("WrongConstant")
         getApplicationInfo(packageName, PackageManager.ApplicationInfoFlags.of(flags.toLong()))
     } else {
         @Suppress("DEPRECATION")
diff --git a/securesignals-ima-dev-app/build.gradle b/securesignals-ima-dev-app/build.gradle
index 2de3883..630e47c 100644
--- a/securesignals-ima-dev-app/build.gradle
+++ b/securesignals-ima-dev-app/build.gradle
@@ -23,7 +23,6 @@ android {
     }
 
     lint {
-        baseline = file("lint-baseline.xml")
         disable 'GradleDependency', 'IconDipSize', 'IconDensities', 'RtlEnabled'
     }
 
diff --git a/securesignals-ima-dev-app/lint-baseline.xml b/securesignals-ima-dev-app/lint-baseline.xml
index f71c200..f418c4a 100644
--- a/securesignals-ima-dev-app/lint-baseline.xml
+++ b/securesignals-ima-dev-app/lint-baseline.xml
@@ -1,15 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.6.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0)" variant="all" version="8.6.0">
-
-    <issue
-        id="WrongConstant"
-        message="Must be one or more of: PackageManager.GET_META_DATA, PackageManager.GET_SHARED_LIBRARY_FILES, PackageManager.MATCH_UNINSTALLED_PACKAGES, PackageManager.MATCH_SYSTEM_ONLY, PackageManager.MATCH_DISABLED_COMPONENTS, PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS, PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS, PackageManager.GET_UNINSTALLED_PACKAGES, PackageManager.MATCH_APEX"
-        errorLine1="        getApplicationInfo(packageName, PackageManager.ApplicationInfoFlags.of(flags.toLong()))"
-        errorLine2="                                                                               ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/uid2/dev/utils/PackageManagerEx.kt"
-            line="9"
-            column="80"/>
-    </issue>
+<issues format="6" by="lint 7.4.2" type="baseline" client="gradle" dependencies="true" name="AGP (7.4.2)" variant="all" version="7.4.2">
 
 </issues>
diff --git a/securesignals-ima-dev-app/src/main/java/com/uid2/dev/utils/PackageManagerEx.kt b/securesignals-ima-dev-app/src/main/java/com/uid2/dev/utils/PackageManagerEx.kt
index 274d3bf..e4f930c 100644
--- a/securesignals-ima-dev-app/src/main/java/com/uid2/dev/utils/PackageManagerEx.kt
+++ b/securesignals-ima-dev-app/src/main/java/com/uid2/dev/utils/PackageManagerEx.kt
@@ -6,6 +6,7 @@ import android.os.Build
 
 fun PackageManager.getApplicationInfoCompat(packageName: String, flags: Int = 0): ApplicationInfo =
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        @Suppress("WrongConstant")
         getApplicationInfo(packageName, PackageManager.ApplicationInfoFlags.of(flags.toLong()))
     } else {
         @Suppress("DEPRECATION")