Move androidComponents to top-level and update packaging options

fibelatti · Nov 23, 2023 · 7e0e3e3 · 7e0e3e3
1 parent a679172
commit 7e0e3e3
Showing 1 changed file with 17 additions and 18 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -105,21 +105,6 @@ android {
         }
     }
 
-    androidComponents {
-        onVariants { variant ->
-            val appName = StringBuilder().apply {
-                append(AppInfo.appName)
-                if (variant.name.contains("noapi", ignoreCase = true)) append(" NoApi")
-                if (variant.name.contains("debug", ignoreCase = true)) append(" Dev")
-            }.toString()
-
-            variant.resValues.put(
-                variant.makeResValueKey("string", "app_name"),
-                com.android.build.api.variant.ResValue(appName, null),
-            )
-        }
-    }
-
     sourceSets {
         forEach { sourceSet -> getByName(sourceSet.name).java.srcDirs("src/${sourceSet.name}/kotlin") }
 
@@ -138,10 +123,24 @@ android {
     testOptions {
         execution = "ANDROIDX_TEST_ORCHESTRATOR"
     }
+}
+
+androidComponents {
+    onVariants { variant ->
+        val appName = StringBuilder().apply {
+            append(AppInfo.appName)
+            if (variant.name.contains("noapi", ignoreCase = true)) append(" NoApi")
+            if (variant.name.contains("debug", ignoreCase = true)) append(" Dev")
+        }.toString()
+
+        variant.resValues.put(
+            variant.makeResValueKey("string", "app_name"),
+            com.android.build.api.variant.ResValue(appName, null),
+        )
+    }
 
-    packaging {
-        resources.excludes.add("META-INF/LICENSE.md")
-        resources.excludes.add("META-INF/LICENSE-notice.md")
+    onVariants(selector().withBuildType("release")) { variant ->
+        variant.packaging.resources.excludes.add("META-INF/*.version")
     }
 }