wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7298 from thundernest/packaging_excludes

Browse source 
Always exclude common files from Android packaging
This commit is contained in:
Wolf-Martell Montwé 2023-10-30 11:10:18 +01:00 committed by GitHub
commit 060a376510
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app-feature-preview/build.gradle.kts
View file

@ -39,14 +39,6 @@ android {
manifestPlaceholders["appAuthRedirectScheme"] = "com.fsck.k9.debug" manifestPlaceholders["appAuthRedirectScheme"] = "com.fsck.k9.debug"
} }
packaging {
resources {
excludes += listOf(
"META-INF/DEPENDENCIES",
)
}
}
buildTypes { buildTypes {
getByName("release") { getByName("release") {
isMinifyEnabled = false isMinifyEnabled = false

9
app/k9mail/build.gradle.kts
View file

@ -156,15 +156,6 @@ android {
resources { resources {
excludes += listOf( 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/*.kotlin_module",
"META-INF/*.version", "META-INF/*.version",
"kotlin/**", "kotlin/**",

23
build-plugin/src/main/kotlin/AndroidExtension.kt
View file

@ -27,6 +27,23 @@ internal fun CommonExtension<*, *, *, *, *>.configureSharedConfig() {
isIncludeAndroidResources = true 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( internal fun CommonExtension<*, *, *, *, *>.configureSharedComposeConfig(
@ -44,12 +61,6 @@ internal fun CommonExtension<*, *, *, *, *>.configureSharedComposeConfig(
warningsAsErrors = false warningsAsErrors = false
abortOnError = true abortOnError = true
} }
packaging {
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}"
}
}
} }
internal fun DependencyHandler.configureSharedComposeDependencies( internal fun DependencyHandler.configureSharedComposeDependencies(