From 7afff19fcec34703137d5455cd36cab719d0d7ad Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sun, 14 Feb 2021 17:33:30 +0530
Subject: [PATCH] build: update AGP

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 buildSrc/src/main/java/BaseProjectConfig.kt | 20 +++++++++++---------
 buildSrc/src/main/java/Dependencies.kt      |  4 ++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt
index f298d778..e2731179 100644
--- a/buildSrc/src/main/java/BaseProjectConfig.kt
+++ b/buildSrc/src/main/java/BaseProjectConfig.kt
@@ -38,7 +38,7 @@ internal fun Project.configureForAllProjects() {
   repositories {
     google()
     mavenCentral()
-    jcenter() {
+    jcenter {
       content {
         // Indirect dependencies
         // https://youtrack.jetbrains.com/issue/IDEA-261387
@@ -102,14 +102,16 @@ internal fun TestedExtension.configureCommonAndroidOptions() {
     targetSdkVersion(30)
   }
 
-  packagingOptions {
-    exclude("**/*.version")
-    exclude("**/*.txt")
-    exclude("**/*.kotlin_module")
-    exclude("**/plugin.properties")
-    exclude("META-INF/AL2.0")
-    exclude("META-INF/LGPL2.1")
-  }
+  packagingOptions.resources.excludes.addAll(
+    setOf(
+      "**/*.version",
+      "**/*.txt",
+      "**/*.kotlin_module",
+      "**/plugin.properties",
+      "META-INF/AL2.0",
+      "META-INF/LGPL2.1"
+    )
+  )
 
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_11
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index b25d0c2b..d93e124c 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -6,8 +6,8 @@
 private const val DAGGER_HILT_VERSION = "2.32-alpha"
 
 object Plugins {
-  const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha05"
-  const val androidGradlePlugin_lintModel = "com.android.tools.lint:lint-model:30.0.0-alpha05"
+  const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha06"
+  const val androidGradlePlugin_lintModel = "com.android.tools.lint:lint-model:30.0.0-alpha06"
   const val daggerGradlePlugin =
     "com.google.dagger:hilt-android-gradle-plugin:${DAGGER_HILT_VERSION}"
   const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30"