diff --git a/app/build.gradle b/app/build.gradle index 49466e9ed..d6723f8a0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ android { } } - testCoverage.jacocoVersion = "0.8.8" + testCoverage.jacocoVersion = "0.8.13" flavorDimensions = ["version"] @@ -85,6 +85,14 @@ android { androidResources { generateLocaleConfig true } + + packagingOptions { + resources { + excludes += "META-INF/LICENSE*" + excludes += "META-INF/versions/9/OSGI-INF/MANIFEST*" + pickFirst "MANIFEST.MF" // workaround for duplicated manifest on some dependencies + } + } } ext { @@ -100,7 +108,7 @@ dependencies { exclude group: 'commons-logging', module: 'commons-logging' } - implementation("com.github.nextcloud:android-library:2.19.1") { + implementation("com.github.nextcloud:android-library:2.21.0") { exclude group: 'org.ogce', module: 'xpp3' } diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys index 392aba8ff..3c632c1e4 100644 --- a/gradle/verification-keyring.keys +++ b/gradle/verification-keyring.keys @@ -616,6 +616,24 @@ ZlI/ojefaZkRseFrtl3X =qnqR -----END PGP PUBLIC KEY BLOCK----- +pub A6EA2E2BF22E0543 +uid Tobias Warneke (for development purposes) + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGNBFJQhigBDADpuhND/VUQwJT0nnJxfjAIur59hyaZZ3Ph/KIgmCneyq7lzYO6 +xa1ucH8mqNBVNLLBhs4CjihBddU/ZKTX3WnZyhQKQMZr3Tg+TCNFmAR4/hnZ3NjZ +N5N5gUj/dqVI2rIvypIuxUApl88BYMsxYpn2+8FKeMd8oBJLqFRJ3WNjB4Op2tRO +XRWoxs1ypubS/IV1zkphHHpi6VSABlTyTWu4kXEj/1/GpsdtHRa9kvdWw7yKQbnM +XuwOxtzZFJcyu0P2jYVfHHvxcjxuklc9edmCGdNxgKIoo0LXZOeFIi6OWtwzD0pn +O6ovJ+PL9QscMdnQlPwsiCwjNUNue20GBv3aUIYc+Z8Gq0SqSan5V0IiKRHMJkzd +FAhnpkSFBvHhPJn07BCcb1kctqL+xnLxIdi7arq3WNA/6bJjsojc/x3FdIvORIeP +sqejhtL8mCBvbMAMHSBrFxclMp+HSz2ouHEEPIQam0KeN8t1yEqIy3/aYKMzHj9c +C3s8XOaBCbJbKpMAEQEAAbQ9VG9iaWFzIFdhcm5la2UgKGZvciBkZXZlbG9wbWVu +dCBwdXJwb3NlcykgPHQud2FybmVrZUBnbXgubmV0Pg== +=q1C6 +-----END PGP PUBLIC KEY BLOCK----- + pub AC7A514BC9F9BB70 uid Punyashloka Biswal @@ -1312,6 +1330,18 @@ xquhnpl2HvE= =A/Aj -----END PGP PUBLIC KEY BLOCK----- +pub D46C5610D06E7001 +sub 00E25FE3776F21F2 +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mDMEZsO4fRYJKwYBBAHaRw8BAQdAcxaiyqFbaECpSz7mhsXzopzN9Cxwv80WlWGN +gM3qpOi4OARmw7h9EgorBgEEAZdVAQUBAQdA45tqjMbTvozvroU+Z0nApYG0r3Zl +gI27fUSEIetPuEIDAQgHiH4EGBYKACYWIQTlLweHelgF+a9KsKzUbFYQ0G5wAQUC +ZsO4fQIbDAUJBaOagAAKCRDUbFYQ0G5wAZG1AP4m+dkpV5g3AT7Lws/lUDrKrdTr +5noqEjUmwUNCiuTOugEArO87llEEIabZngdpe7D+dvJ7Bb+BSX2fzHKmrsE6uwY= +=9gxs +-----END PGP PUBLIC KEY BLOCK----- + pub D9C565AA72BA2FDD sub 9121AD263441EEDD -----BEGIN PGP PUBLIC KEY BLOCK----- diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 70388b989..4af2b4973 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -2636,6 +2636,14 @@ + + + + + + + + @@ -7207,7 +7215,9 @@ - + + + @@ -7274,6 +7284,17 @@ + + + + + + + + + + + @@ -8258,6 +8279,14 @@ + + + + + + + + @@ -8804,6 +8833,14 @@ + + + + + + + + @@ -8907,6 +8944,14 @@ + + + + + + + + @@ -8941,6 +8986,14 @@ + + + + + + + + @@ -8957,6 +9010,14 @@ + + + + + + + + @@ -10067,6 +10128,14 @@ + + + + + + + + @@ -10099,6 +10168,22 @@ + + + + + + + + + + + + + + + + @@ -10123,6 +10208,14 @@ + + + + + + + + @@ -10275,6 +10368,17 @@ + + + + + + + + + + + @@ -10294,6 +10398,14 @@ + + + + + + + + @@ -10312,6 +10424,11 @@ + + + + + @@ -10325,6 +10442,14 @@ + + + + + + + + @@ -10341,6 +10466,14 @@ + + + + + + + + @@ -10418,6 +10551,14 @@ + + + + + + + + @@ -10900,6 +11041,14 @@ + + + + + + + + @@ -11341,6 +11490,14 @@ + + + + + + + + @@ -11737,6 +11894,14 @@ + + + + + + + + @@ -11771,6 +11936,11 @@ + + + + + @@ -11795,6 +11965,14 @@ + + + + + + + + @@ -11819,6 +11997,14 @@ + + + + + + + + @@ -11859,6 +12045,14 @@ + + + + + + + + @@ -11867,6 +12061,14 @@ + + + + + + + + @@ -11875,6 +12077,14 @@ + + + + + + + + @@ -11883,6 +12093,14 @@ + + + + + + + + @@ -11891,6 +12109,14 @@ + + + + + + + + @@ -11899,6 +12125,14 @@ + + + + + + + + @@ -11907,6 +12141,14 @@ + + + + + + + + @@ -11915,6 +12157,14 @@ + + + + + + + + @@ -11923,6 +12173,14 @@ + + + + + + + + @@ -11931,6 +12189,14 @@ + + + + + + + + @@ -11939,6 +12205,14 @@ + + + + + + + + @@ -11947,6 +12221,14 @@ + + + + + + + + @@ -11955,6 +12237,14 @@ + + + + + + + + @@ -12048,6 +12338,14 @@ + + + + + + + +