Merge pull request #54 from androidx/bumpawsbom

Upgrade to amazon-bom 2.25.0
androidx · Apr 10, 2024 · bdcb982 · bdcb982
2 parents d98bb5b + ca129bd
commit bdcb982
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 1 deletion.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 gradle-publish = "1.1.0"
 kotlin = "1.9.22"
-amazon-bom = "2.20.18"
+amazon-bom = "2.25.0"
 google-cloud-storage = "2.30.1"
 s3-mock = "2.11.0"
 retrofit = "2.9.0"

diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
@@ -1197,6 +1197,51 @@ AHqIbW6dobn8gaOSYfr0Men9ei59bUCQFUSTqyLIvw9d/GaP16/cf3GJBUvInoel
 =TEfN
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    D1031D14464180E0
+uid    Viktor Klang <viktor.klang@gmail.com>
+
+sub    326BA6BD408BFA94
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+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
+=0Zos
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    D364ABAA39A47320
 sub    3F606403DCA455C8
 -----BEGIN PGP PUBLIC KEY BLOCK-----

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -89,6 +89,7 @@
          <trusted-key id="48F8E69F6390C9F25CFEDCD268248959359E722B" group="org.apache.tomcat.embed"/>
          <trusted-key id="4DB1A49729B053CAF015CEE9A6ADFC93EF34893E" group="org.hamcrest"/>
          <trusted-key id="4F7E32D440EF90A83011A8FC6425559C47CC79C4" group="javax.annotation"/>
+         <trusted-key id="50A628FFAF58480736B1079FD1031D14464180E0" group="org.reactivestreams"/>
          <trusted-key id="53C935821AA6A755BD337DB53595395EB3D8E1BA" group="org.apache.logging.log4j"/>
          <trusted-key id="54A26BFDC7ECDD39BA4C123AC3BAB45F4AF71FAB" group="io.opencensus"/>
          <trusted-key id="55C895C9A9A107F87E6E3BDC3C9B410084525C69" group="io.prometheus"/>