Skip to content

Commit 28352bf

Browse files
committed
Merge branch 'update-dependencies-droid-2586'
2 parents e5e0ae1 + fac3eb9 commit 28352bf

File tree

64 files changed

+3954
-4158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+3954
-4158
lines changed

android/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@ detekt {
8686
autoCorrect = true
8787
baseline = baselineFile
8888

89-
dependencies {
90-
detektPlugins(project(":test:detekt"))
91-
}
89+
dependencies { detektPlugins(project(":test:detekt")) }
9290
}
9391

9492
val detektExcludedPaths =

android/config/lint-baseline.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
id="InvalidPackage"
66
message="Invalid package reference in library; not included in Android: `javax.naming.directory`. Referenced from `io.grpc.internal.JndiResourceResolverFactory.JndiRecordFetcher`.">
77
<location
8-
file="*/caches/modules-2/files-2.1/io.grpc/grpc-core/1.79.0/df6fe67938e4b8272602a2750028fed007dc1a2e/grpc-core-1.79.0.jar"/>
8+
file="*/caches/modules-2/files-2.1/io.grpc/grpc-core/1.80.0/aae1d22e5a816650e1e7408f2f766bf769de76f1/grpc-core-1.80.0.jar"/>
99
</issue>
1010

1111
<issue
1212
id="InvalidPackage"
1313
message="Invalid package reference in library; not included in Android: `javax.naming`. Referenced from `io.grpc.internal.JndiResourceResolverFactory.JndiRecordFetcher`.">
1414
<location
15-
file="*/caches/modules-2/files-2.1/io.grpc/grpc-core/1.79.0/df6fe67938e4b8272602a2750028fed007dc1a2e/grpc-core-1.79.0.jar"/>
15+
file="*/caches/modules-2/files-2.1/io.grpc/grpc-core/1.80.0/aae1d22e5a816650e1e7408f2f766bf769de76f1/grpc-core-1.80.0.jar"/>
1616
</issue>
1717

1818
</issues>

android/gradle/libs.versions.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,51 +25,51 @@ androidx-datastore = "1.2.1"
2525
androidx-espresso = "3.7.0"
2626
androidx-ktx = "1.18.0"
2727
androidx-lifecycle = "2.10.0"
28-
androidx-nav3 = "1.1.0-beta01"
28+
androidx-nav3 = "1.1.0-rc01"
2929
androidx-material3-adaptive = "1.2.0"
3030
androidx-test = "1.7.0"
3131
androidx-testmonitor = "1.8.0"
3232
androidx-testorchestrator = "1.6.1"
3333
androidx-testrunner = "1.7.0"
3434
androidx-tv = "1.0.1"
3535
androidx-uiautomator = "2.4.0-beta02"
36-
androidx-work = "2.11.1"
37-
arrow = "2.2.2"
36+
androidx-work = "2.11.2"
37+
arrow = "2.2.2.1"
3838
baselineprofile = "1.4.1"
3939
benchmark-macro-junit4 = "1.4.1"
4040
commonsvalidator = "1.10.1"
41-
compose = "1.10.5"
41+
compose = "1.10.6"
4242
compose-constraintlayout = "1.1.1"
4343
compose-material-icons-extended = "1.7.8"
4444
compose-material3 = "1.4.0"
4545
dependency-versions = "0.53.0"
4646
detekt = "1.23.8"
4747
accompanist = "0.37.3"
4848
# Update suppression for 'InvalidPackage' in config/lint.xml
49-
grpc = "1.79.0"
49+
grpc = "1.80.0"
5050
grpc-kotlin = "1.5.0"
5151
junit = "5.13.4"
5252
junit4 = "1.3.0"
5353
junit5-android = "1.8.0"
5454
junit5-android-plugin = "1.13.1.0"
5555
kermit = "2.1.0"
56-
koin = "4.1.1"
57-
koin-compose = "4.1.1"
56+
koin = "4.2.0"
57+
koin-compose = "4.2.0"
5858
konsist = "0.17.3"
5959
# Bump kotlin and kotlin-ksp together, find matching release here:
6060
# https://github.com/google/ksp/releases
61-
kotlin = "2.3.10"
61+
kotlin = "2.3.20"
6262
kotlin-ksp = "2.3.6"
6363
kotlinx = "1.10.2"
6464
kotlinx-serialization-json = "1.10.0"
65-
ktfmt = "0.25.0"
65+
ktfmt = "0.26.0"
6666
ktor = "3.4.1"
6767
leakcanary = "2.14"
6868
mockk = "1.14.9"
6969
play-publisher = "3.13.0"
7070
play-services-location = "21.3.0"
7171
profileinstaller = "1.4.1"
72-
protobuf = "4.34.0"
72+
protobuf = "4.34.1"
7373
protobuf-gradle-plugin = "0.9.6"
7474
turbine = "1.2.1"
7575
annotation-jvm = "1.9.1"

android/gradle/verification-keyring.keys

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,32 @@ ypM6CQ+fdw==
468468
-----END PGP PUBLIC KEY BLOCK-----
469469

470470

471+
pub 0E91C2DE43B72BB1
472+
sub 83552A552A0D431C
473+
-----BEGIN PGP PUBLIC KEY BLOCK-----
474+
475+
xsBNBFBIm/wBCACgqvegptBhfKbyBXZiW+7XchIJCOpwq0/9QgSehKMwELbUKqNM
476+
sIVrywANqYn32S9hNRvBiKGm/KY7VwN9p1Cr6Ey3XuGSbRo/xN6tqfV/rV5YClL5
477+
6sMc67BlnEaCZRNuB9ATeUE/4wCO7fWg79jJuNl8tKQ8EYIrVGizzjmZHt76OwAi
478+
hQtD6A19+qjQ02SyPUJS6a2lKx+gwaHNxv4L2FqImCFGOOEToyRb12GD18Mgbf5o
479+
OtQVVtr3qbT07odFQt8Iyy1DiNUJbOfC+YO2wO7eMTr5xaFr1HejsTvKZiTDC0Nr
480+
EjtctqGxrjxPmoUPNwtxwEDTEh1lyKMhnqgJABEBAAHOwE0EUEib/AEIAMDUgjnP
481+
KBeHIN0KNmXTS/uXXC4LTGltnQJ57OG2kmPz/JjAjYLoLvINY+xtghehMhRY3DmQ
482+
Dy/ufZsgO9oH8PztcC8QL5/dV6VTYf4U3FndbiSKgikaBX7yu5Qcrtkv8XgkJ+aw
483+
IEUgTGDXn2VT1hH6yEG1tA97iT/d7ZUxLEBsVgbxz9VtPellTNK5x/8NGY4NW+fM
484+
6+yGFpjr5juZVYRLa8u565vGBQO5FU7bg/69DftmL7vO4KRLs154VpsfAsTeo1rm
485+
U/8kIjgCVeKFClJG+Sg+m9rsJNYgiKy9dGfD/qDmVlEeWBuhtlAfqM7pHTv1Mu8m
486+
v5/DheBwvlwheg8AEQEAAcLAdgQYAQIACQUCUEib/AIbDAAhCRAOkcLeQ7crsRYh
487+
BC6SETJj/DHHTMuqsg6Rwt5DtyuxoTQH/j/5lyN1R8s+UqT/wEfS0xp8RY4a+pjx
488+
sbhinEaglkdP8tv9ydYMu9nOz3wVVpDcModnBCGG2dAiGe6m/FIdfnAt4Fky0AA0
489+
ZAtq4an4DdLVYFVEezSbM52VUNvMm7tFbvaaeRExKhV3TXx+Hh5DT5WlmHQ9/0p8
490+
okPCkS4RI/X7olwssG9BeUQlgc6TtSnl5GSGWN0jDPdOVK4n2wKxxOAzQ8jv8vV4
491+
U/+IKBkgEeGmWVVXq/kgZfHc/lDthBTLfbMKuG3i319210ty3WPp41oBB08BT3Vq
492+
5JtiG5UKmOAo2nA6/VQuhJYtRQ8w1blBzhkMqr7LA4SW840ydfihpDU=
493+
=EBD4
494+
-----END PGP PUBLIC KEY BLOCK-----
495+
496+
471497
pub 0F9FE62F88E938D8
472498
uid Brad Corso <bcorso@google.com>
473499

android/gradle/verification-metadata.keys.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<trusting group="androidx.datastore"/>
4444
<trusting group="androidx.navigation3"/>
4545
<trusting group="androidx.test.uiautomator"/>
46+
<trusting group="androidx.work"/>
4647
<trusting group="^androidx[.]compose($|([.].*))" regex="true"/>
4748
</trusted-key>
4849
<trusted-key id="0F06FF86BEEAF4E71866EE5232EE5355A6BC6E42">
@@ -102,12 +103,14 @@
102103
<trusting group="org.apache.commons"/>
103104
</trusted-key>
104105
<trusted-key id="2E3A1AFFE42B5F53AF19F780BCF4173966770193" group="org.jetbrains" name="annotations" version="13.0"/>
106+
<trusted-key id="2E92113263FC31C74CCBAAB20E91C2DE43B72BB1" group="org.ec4j.core"/>
105107
<trusted-key id="3051D45031E13516A6E8FAFF280D66A55F5316C5" group="org.bitbucket.b_c" name="jose4j" version="0.9.5"/>
106108
<trusted-key id="31BAE2E51D95E0F8AD9B7BCC40A3C4432BD7308C" group="com.googlecode.juniversalchardet" name="juniversalchardet" version="1.0.3"/>
107109
<trusted-key id="32118CF76C9EC5D918E54967CA80D1F0EB6CA4BA" group="org.codehaus.mojo"/>
108110
<trusted-key id="33FD4BFD33554634053D73C0C2148900BCD3C2AF">
109111
<trusting group="org.jetbrains" name="annotations" version="23.0.0"/>
110112
<trusting group="org.jetbrains.intellij.deps.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.8.0-intellij-14"/>
113+
<trusting group="org.jetbrains.runtime" name="jbr-api" version="1.5.0"/>
111114
</trusted-key>
112115
<trusted-key id="34441E504A937F43EB0DAEF96A65176A0FB1CD0B" group="org.codehaus.groovy" name="groovy" version="3.0.22"/>
113116
<trusted-key id="350C5D75D04AA599CBAD22348D5059F2B1927A9A" group="com.lemonappdev" name="konsist" version="0.17.3"/>
@@ -117,6 +120,7 @@
117120
<trusting group="com.ncorti.ktfmt.gradle" name="plugin" version="0.23.0"/>
118121
<trusting group="com.ncorti.ktfmt.gradle" name="plugin" version="0.24.0"/>
119122
<trusting group="com.ncorti.ktfmt.gradle" name="plugin" version="0.25.0"/>
123+
<trusting group="com.ncorti.ktfmt.gradle" name="plugin" version="0.26.0"/>
120124
</trusted-key>
121125
<trusted-key id="47504B76CF89C15C0512D9AFE16AB52D79FD224F" group="^com[.]google($|([.].*))" regex="true"/>
122126
<trusted-key id="475F3B8E59E6E63AA78067482C7B12F2A511E325" group="org.slf4j"/>
@@ -141,6 +145,7 @@
141145
<trusting group="com.facebook" name="ktfmt" version="0.55"/>
142146
<trusting group="com.facebook" name="ktfmt" version="0.58"/>
143147
<trusting group="com.facebook" name="ktfmt" version="0.59"/>
148+
<trusting group="com.facebook" name="ktfmt" version="0.62"/>
144149
</trusted-key>
145150
<trusted-key id="64B9B09F164AA0BF88742EB61188B69F6D6259CA">
146151
<trusting group="com.google.accompanist" name="accompanist-drawablepainter" version="0.37.3"/>

0 commit comments

Comments
 (0)