Bug 1802817 - Migrate packagingOptions DSL properties to resources sub-block.
exclude, pickFirst methods are deprecated.
This commit is contained in:
@@ -216,15 +216,14 @@ subprojects {
|
||||
}
|
||||
|
||||
packagingOptions {
|
||||
exclude 'META-INF/atomicfu.kotlin_module'
|
||||
exclude 'META-INF/AL2.0'
|
||||
exclude 'META-INF/LGPL2.1'
|
||||
resources {
|
||||
excludes += ['META-INF/atomicfu.kotlin_module', 'META-INF/AL2.0', 'META-INF/LGPL2.1']
|
||||
// Required dependencies using byte-buddy; remove after this is
|
||||
// fixed by: https://issuetracker.google.com/issues/170131605
|
||||
excludes.add("META-INF/licenses/ASM")
|
||||
|
||||
// Required dependencies using byte-buddy; remove after this is
|
||||
// fixed by: https://issuetracker.google.com/issues/170131605
|
||||
exclude "META-INF/licenses/ASM"
|
||||
pickFirst "win32-x86-64/attach_hotspot_windows.dll"
|
||||
pickFirst "win32-x86/attach_hotspot_windows.dll"
|
||||
pickFirsts += ['win32-x86-64/attach_hotspot_windows.dll', 'win32-x86/attach_hotspot_windows.dll']
|
||||
}
|
||||
}
|
||||
|
||||
androidResources {
|
||||
|
||||
Reference in New Issue
Block a user