Bug 1960898 - Update AndroidX Core to version 1.16.0. r=android-reviewers,sfamisa
Differential Revision: https://phabricator.services.mozilla.com/D245729
This commit is contained in:
@@ -30,7 +30,7 @@ concurrent = "1.2.0"
|
||||
constraintlayout = "2.2.1"
|
||||
constraintlayout-compose = "1.1.1"
|
||||
coordinatorlayout = "1.3.0"
|
||||
core = "1.15.0"
|
||||
core = "1.16.0"
|
||||
core-splashscreen = "1.0.1"
|
||||
datastore = "1.1.4"
|
||||
drawerlayout = "1.2.0"
|
||||
|
||||
@@ -167,9 +167,11 @@ subprojects {
|
||||
}
|
||||
}
|
||||
|
||||
// https://issuetracker.google.com/issues/379732901
|
||||
packaging {
|
||||
resources {
|
||||
excludes += ["META-INF/LICENSE.md", "META-INF/LICENSE-notice.md"]
|
||||
excludes += ['META-INF/LICENSE.md', 'META-INF/LICENSE-notice.md',
|
||||
'META-INF/versions/9/OSGI-INF/MANIFEST.MF']
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -21,6 +21,13 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
// https://issuetracker.google.com/issues/379732901
|
||||
packaging {
|
||||
resources {
|
||||
excludes += ['META-INF/versions/9/OSGI-INF/MANIFEST.MF']
|
||||
}
|
||||
}
|
||||
|
||||
namespace = 'mozilla.components.support.test'
|
||||
}
|
||||
|
||||
|
||||
@@ -276,9 +276,11 @@ android {
|
||||
baseline = file("lint-baseline.xml")
|
||||
}
|
||||
|
||||
// https://issuetracker.google.com/issues/379732901
|
||||
packaging {
|
||||
resources {
|
||||
excludes += ["META-INF/LICENSE.md", "META-INF/LICENSE-notice.md"]
|
||||
excludes += ["META-INF/LICENSE.md", "META-INF/LICENSE-notice.md",
|
||||
"META-INF/versions/9/OSGI-INF/MANIFEST.MF"]
|
||||
}
|
||||
jniLibs {
|
||||
useLegacyPackaging = true
|
||||
|
||||
@@ -179,7 +179,11 @@ android {
|
||||
klarNightly.root = 'src/klarNightly'
|
||||
}
|
||||
|
||||
// https://issuetracker.google.com/issues/379732901
|
||||
packaging {
|
||||
resources {
|
||||
pickFirsts += ['META-INF/versions/9/OSGI-INF/MANIFEST.MF']
|
||||
}
|
||||
jniLibs {
|
||||
useLegacyPackaging = true
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user