From d1d14a47df5c1fe254fa952a363236f0ba6db289 Mon Sep 17 00:00:00 2001
From: "Kenneth J. Shackleton" <kshackleton1@bloomberg.net>
Date: Sat, 15 Jul 2023 08:05:08 +0100
Subject: [PATCH] Address AGP deprecation warnings in base Gradle file.

Signed-off-by: Kenneth J. Shackleton <kshackleton1@bloomberg.net>
---
 build.gradle.kts | 41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c58733c28f..01bed323e0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import com.android.build.gradle.TestedExtension
+import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.dsl.LibraryExtension
 import io.gitlab.arturbosch.detekt.Detekt
 import io.gitlab.arturbosch.detekt.extensions.DetektExtension
 import java.net.URL
@@ -94,19 +95,31 @@ subprojects {
             }
         }
     }
-    listOf("com.android.application", "com.android.library").forEach {
-        plugins.withId(it) {
-            extensions.getByType<TestedExtension>().apply {
-                compileOptions {
-                    sourceCompatibility = JavaVersion.VERSION_17
-                    targetCompatibility = JavaVersion.VERSION_17
-                }
-                lintOptions {
-                    isWarningsAsErrors = true
-                }
-                testOptions {
-                    unitTests.isIncludeAndroidResources = true
-                }
+    plugins.withId("com.android.application") {
+        extensions.getByType<ApplicationExtension>().apply {
+            compileOptions {
+                sourceCompatibility = JavaVersion.VERSION_17
+                targetCompatibility = JavaVersion.VERSION_17
+            }
+            lint {
+                warningsAsErrors = true
+            }
+            testOptions {
+                unitTests.isIncludeAndroidResources = true
+            }
+        }
+    }
+    plugins.withId("com.android.library") {
+        extensions.getByType<LibraryExtension>().apply {
+            compileOptions {
+                sourceCompatibility = JavaVersion.VERSION_17
+                targetCompatibility = JavaVersion.VERSION_17
+            }
+            lint {
+                warningsAsErrors = true
+            }
+            testOptions {
+                unitTests.isIncludeAndroidResources = true
             }
         }
     }