diff --git a/app-feature-preview/build.gradle.kts b/app-feature-preview/build.gradle.kts index 53b5803c2..2d1beda7e 100644 --- a/app-feature-preview/build.gradle.kts +++ b/app-feature-preview/build.gradle.kts @@ -39,14 +39,6 @@ android { manifestPlaceholders["appAuthRedirectScheme"] = "com.fsck.k9.debug" } - packaging { - resources { - excludes += listOf( - "META-INF/DEPENDENCIES", - ) - } - } - buildTypes { getByName("release") { isMinifyEnabled = false diff --git a/app/k9mail/build.gradle.kts b/app/k9mail/build.gradle.kts index 5ba60e010..327b040bf 100644 --- a/app/k9mail/build.gradle.kts +++ b/app/k9mail/build.gradle.kts @@ -156,15 +156,6 @@ android { resources { excludes += listOf( - "META-INF/DEPENDENCIES", - "META-INF/LICENSE", - "META-INF/LICENSE.txt", - "META-INF/NOTICE", - "META-INF/NOTICE.txt", - "META-INF/README", - "META-INF/README.md", - "META-INF/CHANGES", - "LICENSE.txt", "META-INF/*.kotlin_module", "META-INF/*.version", "kotlin/**", diff --git a/build-plugin/src/main/kotlin/AndroidExtension.kt b/build-plugin/src/main/kotlin/AndroidExtension.kt index 6fa5d3f64..b9dda6735 100644 --- a/build-plugin/src/main/kotlin/AndroidExtension.kt +++ b/build-plugin/src/main/kotlin/AndroidExtension.kt @@ -27,6 +27,23 @@ internal fun CommonExtension<*, *, *, *, *>.configureSharedConfig() { isIncludeAndroidResources = true } } + + packaging { + resources { + excludes += listOf( + "/META-INF/{AL2.0,LGPL2.1}", + "/META-INF/DEPENDENCIES", + "/META-INF/LICENSE", + "/META-INF/LICENSE.txt", + "/META-INF/NOTICE", + "/META-INF/NOTICE.txt", + "/META-INF/README", + "/META-INF/README.md", + "/META-INF/CHANGES", + "/LICENSE.txt", + ) + } + } } internal fun CommonExtension<*, *, *, *, *>.configureSharedComposeConfig( @@ -44,12 +61,6 @@ internal fun CommonExtension<*, *, *, *, *>.configureSharedComposeConfig( warningsAsErrors = false abortOnError = true } - - packaging { - resources { - excludes += "/META-INF/{AL2.0,LGPL2.1}" - } - } } internal fun DependencyHandler.configureSharedComposeDependencies(