From 9e7ee01813d4b801520ffc419246a8f61f2ae005 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 29 Feb 2024 19:26:33 +0000 Subject: [PATCH 1/5] fix(deps): update dependency com.android.tools.build:gradle to v8.3.0 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- build.gradle | 2 +- gradle/verification-metadata.xml | 361 ++++++++++++++++++++++++++++++- 2 files changed, 359 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index a5a218257..2b0e1fce5 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.2' + classpath 'com.android.tools.build:gradle:8.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}" classpath "org.jetbrains.kotlin:kotlin-serialization:${kotlinVersion}" classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.7' diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 483f46bcc..183b8c8d3 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -12,6 +12,7 @@ + @@ -64,7 +65,10 @@ - + + + + @@ -92,6 +96,7 @@ + @@ -118,7 +123,10 @@ - + + + + @@ -155,7 +163,10 @@ - + + + + @@ -556,6 +567,14 @@ + + + + + + + + @@ -564,6 +583,14 @@ + + + + + + + + @@ -572,6 +599,14 @@ + + + + + + + + @@ -1282,6 +1317,14 @@ + + + + + + + + @@ -1290,6 +1333,14 @@ + + + + + + + + @@ -1298,6 +1349,14 @@ + + + + + + + + @@ -1306,6 +1365,14 @@ + + + + + + + + @@ -1314,6 +1381,14 @@ + + + + + + + + @@ -1322,6 +1397,14 @@ + + + + + + + + @@ -1338,6 +1421,14 @@ + + + + + + + + @@ -1346,6 +1437,14 @@ + + + + + + + + @@ -1354,6 +1453,14 @@ + + + + + + + + @@ -1362,6 +1469,14 @@ + + + + + + + + @@ -1370,6 +1485,14 @@ + + + + + + + + @@ -1378,6 +1501,14 @@ + + + + + + + + @@ -1386,6 +1517,14 @@ + + + + + + + + @@ -1394,6 +1533,14 @@ + + + + + + + + @@ -1402,6 +1549,14 @@ + + + + + + + + @@ -1410,6 +1565,14 @@ + + + + + + + + @@ -1418,6 +1581,14 @@ + + + + + + + + @@ -1426,6 +1597,14 @@ + + + + + + + + @@ -1434,6 +1613,14 @@ + + + + + + + + @@ -1442,6 +1629,14 @@ + + + + + + + + @@ -1450,6 +1645,14 @@ + + + + + + + + @@ -1458,6 +1661,14 @@ + + + + + + + + @@ -1466,6 +1677,14 @@ + + + + + + + + @@ -1474,6 +1693,14 @@ + + + + + + + + @@ -1482,6 +1709,14 @@ + + + + + + + + @@ -1514,6 +1749,14 @@ + + + + + + + + @@ -1554,6 +1797,14 @@ + + + + + + + + @@ -1594,6 +1845,14 @@ + + + + + + + + @@ -1602,6 +1861,14 @@ + + + + + + + + @@ -1618,6 +1885,14 @@ + + + + + + + + @@ -1634,6 +1909,14 @@ + + + + + + + + @@ -1650,6 +1933,14 @@ + + + + + + + + @@ -1666,6 +1957,14 @@ + + + + + + + + @@ -1682,6 +1981,14 @@ + + + + + + + + @@ -1714,6 +2021,14 @@ + + + + + + + + @@ -1730,6 +2045,14 @@ + + + + + + + + @@ -1746,6 +2069,14 @@ + + + + + + + + @@ -1762,6 +2093,14 @@ + + + + + + + + @@ -2322,6 +2661,14 @@ + + + + + + + + @@ -2387,6 +2734,14 @@ + + + + + + + + From 5b8503b8a820f2f6090d4da722b0910927b95a52 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Feb 2024 21:36:12 +0100 Subject: [PATCH 2/5] Add further keys and checksums Signed-off-by: Andy Scherzinger --- gradle/verification-keyring.keys | 103 +++++++++++++++++++++++++++++++ gradle/verification-metadata.xml | 11 +++- 2 files changed, 113 insertions(+), 1 deletion(-) diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys index 5e2b35683..ec2a8f58b 100644 --- a/gradle/verification-keyring.keys +++ b/gradle/verification-keyring.keys @@ -1674,6 +1674,43 @@ fW1AkBVEk6siyL8PXfxmj9ev3H9xiQVLyJ6HpdHTLVjHjFkgNOLd =R7zg -----END PGP PUBLIC KEY BLOCK----- +pub D041CAD2E452550F +uid Deanna + +sub 5199F3DAE89C332D +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: BCPG v1.68 + +mQGNBGCtdhoBDADdopjDt4eUNEqLJSw1ZICSR0oq09SOVtJSaSYdF8UiXjBfL1Ds +fhTDqSv5pT2a2gLj0OU3tFhWHvINLaKKCjQnHVcFXi2LTxt+XBOjRYkFjHVisbaZ +PZ6HnTMStPrvs+hQ168vU3VfYOsOLN22j53I/Ba+FA7E0G0bqkratuT5L7BTR1mC +fqDaeisWSCllfe6EEysaFF+/1RcRy+Yt+8ZWV0FZEF7UwQvqKHcYmlkqPIn3v/8y +J/yvmzIEtCQ1F+bvJbzaROmeJf254G2Uh7IfMYEm9WlqnGwNdbIhil7bdxq8Y/0H +XbQPaESxkki7yL5JTfH/+UzdklMe+Dga273L/cgzfjV3zJJ9vR94W5ABAbGYh4ZW +aKvNnT1m4vTbEMfo4r3NF2zc+K9Ly/JNaHqkR5M4SVElvN2lsC5KNUiRvExhg+h0 +mKyx61mu3gUIrC1UOmqhtx7RzQQf7ESMdzmNHY0P93lR0Ic10fyli0wfl7A6q7+q +zV2a1V2k9Yg6B9sAEQEAAbQgRGVhbm5hIDxkZWFubmFnYXJjaWFAZ29vZ2xlLmNv +bT65AY0EYK12GgEMAMgP3//QeBsTS3IrfSp3m44el96X6BWona2yo4DvVyuwqfUL +ZE+Nhj7I+kEZLrA29AOySOD/6quJ4MIJZfq/Do920Di8/10WQ00OdCM1wH7bMz2U +vcSqsr0iOgQtycuUf7JOHSTME9vqk+C3Lhn0r59AVaRdXEe6zBgNZyzZJeCr5F8w +RhglPlwvhOGs2aLEqlCxFnY4pLayQFoQyw1lDjHIXHg5JtfOHvqiNXVDcGpyKLG8 +SzImp62iL4sfuA0weVIQeS9kZiQabSYKvSf3TvNXYTgmFz/vjPbYhv9LTkBroTlV +g3l+UmAxLrHVuXMx0zX3jfNNHAqUjVhPYZhnifMkmGJgLeMIVqr5Q/tx8pzyYiiO +cqQ1zDg8ubJDGRue1JjlUGdw19OvhFDs+lydukt8Mmhb0gPkBLi2syZHgYHtEooX +PLwEsJ+SynZCFhZiWj8BsWNFJpaDd8ynNeWhMAcwi3B5ZeQiZaAlV0sItxsrzvbu +4ZYZtkjAkQdsaaTWSwARAQABiQG8BBgBCgAmFiEEaWthmaKp2MKc54zA0EHK0uRS +VQ8FAmCtdhoCGwwFCQPCZwAACgkQ0EHK0uRSVQ+G7wwAvaVPDgnM+i2pGQPwq6Mk +SzhKEG4H1pvBWyYR8H9D3p/dE33IjVu3EEy1h37Nzdyp46KtASGNe3KBodSsh6gv +PlV5pNGxMNbX6fo8ZGtS83C+6uTF1cYmuO1nmi8P4+7qtcNZg4xv/ujAZIC20kem +YKDth3FvPxEXsoxY+Ns7sxgd3SqoyLhjcyoczI8uyhim5nfvvbnEd6WrdiBPBtb/ +F1h/nfqdFj2TcZkAlnzGnlVlgU8J60u6zE+9VvBm0lJR73Ar55mQEwarGFPL1a3/ +A7ZEeNa0Dc3Oa5sKMYtxMlGKZ0WGUoGcDWiaDEsv5YyRnaSOaXKM1NkJCR013QAr +RcHrRBPo+0/RIZVE+b8oEcmGzdL8HNwnm7e06ruZryF9LQA5YBmCKE0urigmgEvC +zZsj/fMJ+OIZcAhE7UVae48GpW2kLATxmK01oSzvizIlmN3rVz2EnjOun2iuuEpF +/lmDbjK5n1r3f8npB1l1fT5cozzQJkPVYzhBWH1KXP5X +=nh9O +-----END PGP PUBLIC KEY BLOCK----- + pub D364ABAA39A47320 sub 3F606403DCA455C8 -----BEGIN PGP PUBLIC KEY BLOCK----- @@ -2088,6 +2125,35 @@ GxfCvaXsIEIqfg+55vyDf41M8t/9/wlAp9xrMJrgObOqtM91CnvVYV6zVuja51d2 =V/CK -----END PGP PUBLIC KEY BLOCK----- +pub EE92349AD86DE446 +uid Thomas Ball + +sub E68665C8F91BDE69 +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: BCPG v1.68 + +mQENBGO91akBCADDDpIrW/IohUSJNDu9VOUlnfEOm5VS49uqM0uucLi0BeAhy1Fo +P6Yg1cJkcK66DtnUoTM/JJLyDzJRlKnniLrYCkw8ScvtPdA5cQKJTY5ecn+9ouR2 +SC9GkBMgagbCScP1xE45q5FO+z4kwmcERIKOQ687VAk64QM6hJCupfAd6SqS/X0Q +SGttTNtmj7YBpfnU5iFX05Hj8Zkk7CX439xltO8uJNyBlDVbuUZc3/kRowKPVuuo +TK2mzllVPzE/YT6NUY04wQPmRJx0uWZQUyDBZeckdurpSImdd7sik6Wf6zVGvxvg +MC4oMufZ3EM8R4dssRSIUfnBaQ2o1LS+GVxjABEBAAG0HlRob21hcyBCYWxsIDx0 +YmFsbEBnb29nbGUuY29tPrkBDQRjvdWpAQgA0k8hiP0izEoo5Ys6Ra/ECD2j2Ssi +SiEExo4ZGzHhHFDICs4JShob+qwbdpU6LzAwvyFArqqhcAMnoUEbFDrsbyml6vNF +KPU7cEkgsHoV3VfzDjRLqFK9QBmz4MzUUy4PiZ/rJ27JlRUiCEZETE15Jv+9+fgp +U+p1IAPu5Z5CIhRi95pevCi3z5Ty1E2C/4tCkKOGbmG9bIi7HGkj6Tk3TtX3LTJE +ZaIFuCp2Z8dXB0RtRIzSwxhQlRkpb6LB/m1mKD0tm7ccB/+/JeMFYbrOSSPA7yic +oUu6EviOTKAcZJrAkfBhGC2WSdRnQMxVzjnVtuG4UcTR1yBAJ0BgmwjrowARAQAB +iQE8BBgBCAAmFiEE6xs95xcTyewuh8wm7pI0mtht5EYFAmO91akCGwwFCQPCZwAA +CgkQ7pI0mtht5EY0LQf/UkEplnz4ksZwZ59yGwRbFw1E3zIG0O0MzykSwL30+36/ +MtoBhgVs9UqnOvnvMjFm+2byZRtY5rhnx4e3MtFAQWKsq693jthQ87Ie1915xyvR +7uJBDaulGY5WueQq7gscj5/iMUSb4977cLIth7+0Eop4E4qNEBalCLsnPUZBS670 +kW7h9SmHPPTPkvJsYdrVPtBn7Z7DySouXwQR5kCrjH9u6VtpfTnS9+yBQufVf0AQ +JbQJf85p+8W5KsRmwtRLDQrObOow84sxc6H8RmyinXsOqEZ7k07sagKezdfGqOmC +AwT14IRCih4oeUsICRfb9e23BVJGWs2x1VvzaIrLsQ== +=vv+C +-----END PGP PUBLIC KEY BLOCK----- + pub EE9E7DC9D92FC896 sub 3B7272A25F20140F -----BEGIN PGP PUBLIC KEY BLOCK----- @@ -4395,6 +4461,43 @@ xXZy2unHAPYyfxDLPkbTR7Mm4k8Cva8PCcXotDow4bDLm9rhwVkJ =Hgs4 -----END PGP PUBLIC KEY BLOCK----- +pub 4604091C01C3086A +uid Dave Brosius + +sub 8C8D68AF389810C4 +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: BCPG v1.68 + +mQGNBGQSS3oBDACzF8yjumbMujh5LRH4c+AaUkaVfMv/tiSCWXANtlJrU+XRPeKw +Sm/jmT3g/W1cTbbTOt9I7329jrqbISHYSzmG4Q5f+KlHl2Mine6mUl6ipuIKmwhk +KfePwNRLa9KUwxSPzLa0N8mB3PZjQ+FQ22IQk+BGwWsFFClSrP2nuXVi0VPctBWs +jh5WUFu2dK2P0ZWJdb53ZJn53EVssvuQfanUqrxkEgvFc9yyIy4HKaqzHd8Etze5 +2NSt8LNUpdkPU4Agla4rhvhXIYQ8lL1Mhg3DAkmC7XGLuYxZq29esu3KYz+NfNrz +4z1E5jxm17BQ3x8aP06TSpeTFC6GiBRzMz9l4ycUohvb+5fLZJVBYIHY7xBhfU/P +2q6ipQPMo+t+bCIzMkQIeinsXq0LV8R7uODKUjy9IVg/ssqhcUovf0M505Pfaj30 +/9SZZ1vtNf3QUTbsHtINTl9bB87txqEp9tQDSFmU/cFynTeCK/VAvfrQyTUmFI7l +FdmRyVM6RF2chVEAEQEAAbQkRGF2ZSBCcm9zaXVzIDxtZWJpZ2ZhdGd1eUBnbWFp +bC5jb20+uQGNBGQSS3oBDADpK2KWHLVpVXJjkMnqr+TSUDW8VnEkdA2feLtyZZ+m +AoLto7SU/WpIpraWTvmBSwJWZITnKaOVQbNeVVcbv+HE3KkLwtFVeV8cjK2sQAMA +EQT7X+CtBegj6jIUYLQEbFoACnrfQUif0Rd1TU4NgqCLQfoKGq1OMUhfePteqVp4 +uv4dB7YUyntdkiCJgMFO6q8z/m35FlDSSaWdQew1d0WxTZxpO60WfC1li9Sx+h2+ +Ve8Euq8VKM4IyMp9co/oUw8SVnwb1PxUd6Xiz1s38W5F7McqSf3Et8ZasFVWLOZN +RFw0U+5pACExRJX2hiNNBYA9n3CHmtxUXWfuDPmFpeRdPno0DOp1s+Po3TwGcfg9 +EEqMEL19xOIq7Vgcv+naiSNNC5rOJc4qINEbf/H6sPK1WMSLKipWZ6BOf8ECMWex +zaWufsCHuZV3Snm8hEfqiEKUharFfdkdgmlkBF+OH6+HTCnaMlwuILfFSQCPkRUd +W9cEWGqft9AkDDoNP4smmGUAEQEAAYkBvAQYAQoAJhYhBLCHoOuEFlY6/mTOukYE +CRwBwwhqBQJkEkt6AhsMBQkDwmcAAAoJEEYECRwBwwhqWZsMAI32IIZp6pc8Bjk0 +UR9OYOSoTz5Ezmh9SlpO3LOLlb7OUUOuXt5ygzDGE5dChAA1V9tOTLyU8+qfXHOd +cJSJX7oYTIpFDYi4vTQFh9Uo5iXwHXFmuhhUMFpKJNaynhmMATs6l8O6Xt5W0OiJ +D4j5XqjDOVf/NNPS3gro4EKz/Qh/FuVs1n4iT38xJBE0CZhwz8X8JDWdT0eAvZBJ +gAGSZh4AE5KzKj0jQwoiACA6qeOCzJ/sfl0fojDJ4PehxJFfRs2hpTOp/AjjF78t +EGqzkcDrDM8gGCstIVeJDhB1yOvA63ExAkkFR14we0JZliFYHROJmo4GR7wKebqM +3UI989rk+O6bgIk+yEfFGLH3Au3tNc8eLNU0qspE2H1enmb6hj6NiTEoE+7OKrzL +vzqZL9WH1qfOB26bczhzqYBdpE3HRRqvOaFo2o7Rm9biGIJ/QqTk9C0xcI1/5BNv +2X76kgI6+2mxiKKvZiERRfYIye0c4h8c+SrfWHSEEXZxaPtTwA== +=tT4f +-----END PGP PUBLIC KEY BLOCK----- + pub 4B1E11D5A4B91E89 uid Adam Cozzette diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 183b8c8d3..0017e148f 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -4,7 +4,7 @@ true true - + @@ -188,6 +188,7 @@ + @@ -1525,6 +1526,14 @@ + + + + + + + + From 03f0dfb3b82831f35d2663ea8fc2f00bc875c5bc Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Feb 2024 21:42:09 +0100 Subject: [PATCH 3/5] remove by now included keys Signed-off-by: Andy Scherzinger --- gradle/verification-metadata.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 0017e148f..b5e9f1773 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -7,13 +7,6 @@ - - - - - - - From 9f3aa9c65615425c2796805211ccc80225c40b59 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Feb 2024 21:54:13 +0100 Subject: [PATCH 4/5] fix trusted aapt package Signed-off-by: Andy Scherzinger --- gradle/verification-metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index b5e9f1773..2b4c6df55 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -4,7 +4,7 @@ true true - + From 9593d957da748bacd3575013900886efc41aaf95 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Feb 2024 23:13:06 +0100 Subject: [PATCH 5/5] Add further 8.3.0 dependency meta data Signed-off-by: Andy Scherzinger --- gradle/verification-metadata.xml | 208 +++++++++++++++++++++++++++++++ 1 file changed, 208 insertions(+) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 2b4c6df55..09f34c0ed 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1407,6 +1407,14 @@ + + + + + + + + @@ -1767,6 +1775,14 @@ + + + + + + + + @@ -1775,6 +1791,14 @@ + + + + + + + + @@ -1783,6 +1807,14 @@ + + + + + + + + @@ -1791,6 +1823,14 @@ + + + + + + + + @@ -1815,6 +1855,14 @@ + + + + + + + + @@ -1823,6 +1871,14 @@ + + + + + + + + @@ -1831,6 +1887,14 @@ + + + + + + + + @@ -1839,6 +1903,14 @@ + + + + + + + + @@ -1879,6 +1951,14 @@ + + + + + + + + @@ -1903,6 +1983,14 @@ + + + + + + + + @@ -1927,6 +2015,14 @@ + + + + + + + + @@ -1951,6 +2047,14 @@ + + + + + + + + @@ -1975,6 +2079,14 @@ + + + + + + + + @@ -1999,6 +2111,14 @@ + + + + + + + + @@ -2007,6 +2127,14 @@ + + + + + + + + @@ -2015,6 +2143,14 @@ + + + + + + + + @@ -2039,6 +2175,14 @@ + + + + + + + + @@ -2063,6 +2207,14 @@ + + + + + + + + @@ -2087,6 +2239,14 @@ + + + + + + + + @@ -2103,6 +2263,14 @@ + + + + + + + + @@ -2704,6 +2872,14 @@ + + + + + + + + @@ -2712,6 +2888,14 @@ + + + + + + + + @@ -2720,6 +2904,14 @@ + + + + + + + + @@ -2728,6 +2920,14 @@ + + + + + + + + @@ -2752,6 +2952,14 @@ + + + + + + + +