mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-19 19:49:33 +01:00
Migrate packagingOptions exclusions to packagingOptions / resources / exclusions
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
parent
2c2d4aa306
commit
c7e204172f
@ -95,16 +95,20 @@ android {
|
|||||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
packagingOptions {
|
packagingOptions {
|
||||||
exclude 'META-INF/LICENSE.txt'
|
resources {
|
||||||
exclude 'META-INF/LICENSE'
|
excludes += [
|
||||||
exclude 'META-INF/NOTICE.txt'
|
'META-INF/LICENSE.txt',
|
||||||
exclude 'META-INF/NOTICE'
|
'META-INF/LICENSE',
|
||||||
exclude 'META-INF/DEPENDENCIES'
|
'META-INF/NOTICE.txt',
|
||||||
exclude 'META-INF/rxjava.properties'
|
'META-INF/NOTICE',
|
||||||
|
'META-INF/DEPENDENCIES',
|
||||||
|
'META-INF/rxjava.properties'
|
||||||
|
]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
android.applicationVariants.all { variant ->
|
android.applicationVariants.all { variant ->
|
||||||
String variantName = variant.name
|
String variantName = variant.name
|
||||||
String capVariantName = variantName.substring(0, 1).toUpperCase(Locale.ROOT) + variantName.substring(1)
|
String capVariantName = variantName.substring(0, 1).toUpperCase(Locale.ROOT) + variantName.substring(1)
|
||||||
|
Loading…
Reference in New Issue
Block a user