From 403bb383b5caa23bbb14f4e59e2727ae70ed2283 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 29 Jul 2021 15:24:31 +0530
Subject: Upgrade to AGP 7.0.0 (#1474)

---
 buildSrc/src/main/java/BaseProjectConfig.kt | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

(limited to 'buildSrc/src/main/java/BaseProjectConfig.kt')

diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt
index e4dfa7e4..f3a33713 100644
--- a/buildSrc/src/main/java/BaseProjectConfig.kt
+++ b/buildSrc/src/main/java/BaseProjectConfig.kt
@@ -81,16 +81,22 @@ internal fun BaseAppModuleExtension.configureAndroidApplicationOptions(project:
     buildConfig = true
   }
 
-  flavorDimensions(FlavorDimensions.FREE)
+  flavorDimensions.add(FlavorDimensions.FREE)
   productFlavors {
-    create(ProductFlavors.FREE) {}
-    create(ProductFlavors.NON_FREE) {}
+    register(ProductFlavors.FREE) {}
+    register(ProductFlavors.NON_FREE) {}
   }
 
   buildTypes {
     named(BuildType.RELEASE.name) {
       isMinifyEnabled = !minifySwitch.isPresent
-      setProguardFiles(listOf("proguard-android-optimize.txt", "proguard-rules.pro"))
+      setProguardFiles(
+        listOf(
+          "proguard-android-optimize.txt",
+          "proguard-rules.pro",
+          "proguard-rules-missing-classes.pro",
+        )
+      )
       buildConfigField("boolean", "ENABLE_DEBUG_FEATURES", "${project.isSnapshot()}")
     }
     named(BuildType.DEBUG.name) {
@@ -105,11 +111,11 @@ internal fun BaseAppModuleExtension.configureAndroidApplicationOptions(project:
 /** Apply baseline configurations for all Android projects (Application and Library). */
 @Suppress("UnstableApiUsage")
 internal fun TestedExtension.configureCommonAndroidOptions() {
-  compileSdkVersion(30)
+  setCompileSdkVersion(30)
 
   defaultConfig {
-    minSdkVersion(23)
-    targetSdkVersion(29)
+    minSdk = 23
+    targetSdk = 29
   }
 
   sourceSets {
@@ -118,10 +124,10 @@ internal fun TestedExtension.configureCommonAndroidOptions() {
   }
 
   packagingOptions {
-    exclude("**/*.version")
-    exclude("**/*.txt")
-    exclude("**/*.kotlin_module")
-    exclude("**/plugin.properties")
+    resources.excludes.add("**/*.version")
+    resources.excludes.add("**/*.txt")
+    resources.excludes.add("**/*.kotlin_module")
+    resources.excludes.add("**/plugin.properties")
   }
 
   compileOptions {
-- 
cgit v1.2.3