Merge pull request #2726 from nextcloud/update-lib (49680e36) · Commits · e / os / Notes

app/build.gradle

+10 −2

Original line number	Diff line number	Diff line
		@@ -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'
		}

gradle/verification-keyring.keys

+30 −0

Original line number	Diff line number	Diff line
		@@ -616,6 +616,24 @@ ZlI/ojefaZkRseFrtl3X
		=qnqR
		-----END PGP PUBLIC KEY BLOCK-----

		pub A6EA2E2BF22E0543
		uid Tobias Warneke (for development purposes) <t.warneke@gmx.net>

		-----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 <punya@google.com>

		@@ -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-----