Skip to content

Commit 49680e3

Browse files
Merge pull request #2726 from nextcloud/update-lib
update lib
2 parents 7f0c28d + 871a299 commit 49680e3

File tree

3 files changed

+339
-3
lines changed

3 files changed

+339
-3
lines changed

app/build.gradle

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ android {
5454
}
5555
}
5656

57-
testCoverage.jacocoVersion = "0.8.8"
57+
testCoverage.jacocoVersion = "0.8.13"
5858

5959
flavorDimensions = ["version"]
6060

@@ -85,6 +85,14 @@ android {
8585
androidResources {
8686
generateLocaleConfig true
8787
}
88+
89+
packagingOptions {
90+
resources {
91+
excludes += "META-INF/LICENSE*"
92+
excludes += "META-INF/versions/9/OSGI-INF/MANIFEST*"
93+
pickFirst "MANIFEST.MF" // workaround for duplicated manifest on some dependencies
94+
}
95+
}
8896
}
8997

9098
ext {
@@ -100,7 +108,7 @@ dependencies {
100108
exclude group: 'commons-logging', module: 'commons-logging'
101109
}
102110

103-
implementation("com.github.nextcloud:android-library:2.19.1") {
111+
implementation("com.github.nextcloud:android-library:2.21.0") {
104112
exclude group: 'org.ogce', module: 'xpp3'
105113
}
106114

gradle/verification-keyring.keys

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,24 @@ ZlI/ojefaZkRseFrtl3X
616616
=qnqR
617617
-----END PGP PUBLIC KEY BLOCK-----
618618

619+
pub A6EA2E2BF22E0543
620+
uid Tobias Warneke (for development purposes) <[email protected]>
621+
622+
-----BEGIN PGP PUBLIC KEY BLOCK-----
623+
624+
mQGNBFJQhigBDADpuhND/VUQwJT0nnJxfjAIur59hyaZZ3Ph/KIgmCneyq7lzYO6
625+
xa1ucH8mqNBVNLLBhs4CjihBddU/ZKTX3WnZyhQKQMZr3Tg+TCNFmAR4/hnZ3NjZ
626+
N5N5gUj/dqVI2rIvypIuxUApl88BYMsxYpn2+8FKeMd8oBJLqFRJ3WNjB4Op2tRO
627+
XRWoxs1ypubS/IV1zkphHHpi6VSABlTyTWu4kXEj/1/GpsdtHRa9kvdWw7yKQbnM
628+
XuwOxtzZFJcyu0P2jYVfHHvxcjxuklc9edmCGdNxgKIoo0LXZOeFIi6OWtwzD0pn
629+
O6ovJ+PL9QscMdnQlPwsiCwjNUNue20GBv3aUIYc+Z8Gq0SqSan5V0IiKRHMJkzd
630+
FAhnpkSFBvHhPJn07BCcb1kctqL+xnLxIdi7arq3WNA/6bJjsojc/x3FdIvORIeP
631+
sqejhtL8mCBvbMAMHSBrFxclMp+HSz2ouHEEPIQam0KeN8t1yEqIy3/aYKMzHj9c
632+
C3s8XOaBCbJbKpMAEQEAAbQ9VG9iaWFzIFdhcm5la2UgKGZvciBkZXZlbG9wbWVu
633+
dCBwdXJwb3NlcykgPHQud2FybmVrZUBnbXgubmV0Pg==
634+
=q1C6
635+
-----END PGP PUBLIC KEY BLOCK-----
636+
619637
pub AC7A514BC9F9BB70
620638
uid Punyashloka Biswal <[email protected]>
621639

@@ -1312,6 +1330,18 @@ xquhnpl2HvE=
13121330
=A/Aj
13131331
-----END PGP PUBLIC KEY BLOCK-----
13141332

1333+
pub D46C5610D06E7001
1334+
sub 00E25FE3776F21F2
1335+
-----BEGIN PGP PUBLIC KEY BLOCK-----
1336+
1337+
mDMEZsO4fRYJKwYBBAHaRw8BAQdAcxaiyqFbaECpSz7mhsXzopzN9Cxwv80WlWGN
1338+
gM3qpOi4OARmw7h9EgorBgEEAZdVAQUBAQdA45tqjMbTvozvroU+Z0nApYG0r3Zl
1339+
gI27fUSEIetPuEIDAQgHiH4EGBYKACYWIQTlLweHelgF+a9KsKzUbFYQ0G5wAQUC
1340+
ZsO4fQIbDAUJBaOagAAKCRDUbFYQ0G5wAZG1AP4m+dkpV5g3AT7Lws/lUDrKrdTr
1341+
5noqEjUmwUNCiuTOugEArO87llEEIabZngdpe7D+dvJ7Bb+BSX2fzHKmrsE6uwY=
1342+
=9gxs
1343+
-----END PGP PUBLIC KEY BLOCK-----
1344+
13151345
pub D9C565AA72BA2FDD
13161346
sub 9121AD263441EEDD
13171347
-----BEGIN PGP PUBLIC KEY BLOCK-----

0 commit comments

Comments
 (0)