Skip to content

Commit a5aeb6b

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into pr-leo-berman
2 parents 99fd6de + c074f6b commit a5aeb6b

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ materialVersion = "1.13.0"
6262
media3 = "1.9.1"
6363
mockitoKotlinVersion = "6.2.3"
6464
mockitoVersion = "5.21.0"
65-
mockkVersion = "1.14.7"
65+
mockkVersion = "1.14.9"
6666
nnioVersion = "0.3.1"
6767
objenesis = "3.4"
6868
orchestratorVersion = "1.6.1"

gradle/verification-metadata.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,10 @@
319319
<trusting group="^org[.]jetbrains($|([.].*))" regex="true"/>
320320
</trusted-key>
321321
<trusted-key id="8A10792983023D5D14C93B488D7F1BEC1E2ECAE7" group="^com[.]fasterxml[.]jackson($|([.].*))" regex="true"/>
322-
<trusted-key id="8DF3B0AA23ED78BE5233F6C2DEA3D207428EF16D" group="com.linkedin.dexmaker" name="dexmaker" version="2.28.3"/>
322+
<trusted-key id="8DF3B0AA23ED78BE5233F6C2DEA3D207428EF16D">
323+
<trusting group="com.linkedin.dexmaker" name="dexmaker" version="2.28.3"/>
324+
<trusting group="com.linkedin.dexmaker" name="dexmaker" version="2.28.6"/>
325+
</trusted-key>
323326
<trusted-key id="8E3A02905A1AE67E7B0F9ACD3967D4EDA591B991" group="org.jetbrains.kotlinx" name="kotlinx-html-jvm" version="0.8.1"/>
324327
<trusted-key id="8F9A3C6D105B9F57844A721D79E193516BE7998F">
325328
<trusting group="org.dom4j" name="dom4j" version="2.1.3"/>

0 commit comments

Comments
 (0)