Skip to content

Commit ba7f95a

Browse files
authored
Clean up app/build.gradle (#1421)
* Remove packaging resources exclusion and configurations * Update mikepenz-aboutLibraries to 12.1.0-rc03 and configure resource merging for LICENSE files
1 parent 993fffa commit ba7f95a

File tree

2 files changed

+8
-17
lines changed

2 files changed

+8
-17
lines changed

app/build.gradle.kts

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,17 @@ android {
8989
disable += arrayOf("GoogleAppIndexingWarning", "ImpliedQuantity", "MissingQuantity", "MissingTranslation", "ExtraTranslation", "RtlEnabled", "RtlHardcoded", "Typos")
9090
}
9191

92+
androidResources {
93+
generateLocaleConfig = true
94+
}
95+
9296
packaging {
9397
resources {
94-
excludes += arrayOf("META-INF/*.md")
98+
// multiple (test) dependencies have LICENSE files at same location
99+
merges += arrayOf("META-INF/LICENSE*")
95100
}
96101
}
97102

98-
androidResources {
99-
generateLocaleConfig = true
100-
}
101-
102103
@Suppress("UnstableApiUsage")
103104
testOptions {
104105
managedDevices {
@@ -118,20 +119,10 @@ ksp {
118119
}
119120

120121
aboutLibraries {
122+
// exclude timestamps for reproducible builds [https://github.com/bitfireAT/davx5-ose/issues/994]
121123
excludeFields = arrayOf("generated")
122124
}
123125

124-
configurations {
125-
configureEach {
126-
// exclude modules which are in conflict with system libraries
127-
exclude(module="commons-logging")
128-
exclude(group="org.json", module="json")
129-
130-
// Groovy requires SDK 26+, and it's not required, so exclude it
131-
exclude(group="org.codehaus.groovy")
132-
}
133-
}
134-
135126
dependencies {
136127
// core
137128
implementation(libs.kotlin.stdlib)

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ kotlin = "2.1.20"
3333
kotlinx-coroutines = "1.10.2"
3434
# see https://github.com/google/ksp/releases for version numbers
3535
ksp = "2.1.20-2.0.0"
36-
mikepenz-aboutLibraries = "12.1.0-rc02"
36+
mikepenz-aboutLibraries = "12.1.0-rc03"
3737
nsk90-kstatemachine = "0.33.0"
3838
mockk = "1.14.0"
3939
okhttp = "4.12.0"

0 commit comments

Comments
 (0)