Merge pull request #22 from syxc/dev

Update build config
syxc · May 16, 2024 · 21be1b8 · 21be1b8
2 parents dcb0633 + 6377036
commit 21be1b8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -88,6 +88,14 @@ android {
   }
 }
 
+androidComponents {
+  onVariants(selector().withBuildType("release")) {
+    // Only exclude *.version files in release mode as debug mode requires
+    // these files for layout inspector to work.
+    it.packaging.resources.excludes.add("META-INF/*.version")
+  }
+}
+
 dependencies {
   implementation(projects.shared)
   // implementation(projects.sharedCompose)

diff --git a/build-logic/convention/src/main/kotlin/Versions.kt b/build-logic/convention/src/main/kotlin/Versions.kt
@@ -24,11 +24,12 @@ object Versions {
 // packaging-resources-excludes
 object Resources {
   val excludes = listOf(
-    "/META-INF/{AL2.0,LGPL2.1}",
     "DebugProbesKt.bin",
     "kotlin-tooling-metadata.json",
     "kotlin/**",
-    "META-INF/*.version",
+    // Only exclude *.version files in release mode as debug mode requires these files for layout inspector to work.
+    // "META-INF/*.version",
+    "META-INF/{AL2.0,LGPL2.1}",
     "META-INF/DEPENDENCIES",
     "META-INF/DEPENDENCIES.txt",
     "META-INF/NOTICE",
@@ -37,6 +38,7 @@ object Resources {
     "META-INF/LICENSE.txt",
     "META-INF/INDEX.LIST",
     "META-INF/*.kotlin_module",
-    "**/sentry-external-modules.txt" // assets/sentry-external-modules.txt
+    // assets/sentry-external-modules.txt
+    "**/sentry-external-modules.txt"
   )
 }