Skip to content

Commit

Permalink
Merge branch 'bump-dependencies-4'
Browse files Browse the repository at this point in the history
  • Loading branch information
Rawa committed Jan 7, 2025
2 parents c934c49 + c5b0b89 commit 0951379
Show file tree
Hide file tree
Showing 6 changed files with 619 additions and 828 deletions.
4 changes: 2 additions & 2 deletions android/buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ object Versions {
const val minSdkVersion = 26
const val targetSdkVersion = 35

const val junitJupiter = "5.11.3"
const val junitJupiter = "5.11.4"
const val junit5Android = "1.6.0"
const val junit5Plugin = "1.11.2.0"
const val junit5Plugin = "1.11.3.0"
}
2 changes: 1 addition & 1 deletion android/config/dependency-check-suppression.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<packageUrl regex="true">^pkg:maven/com\.google\.protobuf/protobuf-.*@.*$</packageUrl>
<cve>CVE-2024-7254</cve>
</suppress>
<suppress until="2025-01-04Z">
<suppress until="2025-04-04Z">
<notes><![CDATA[
No impact since the app doesn't process externally crafted XML.
]]></notes>
Expand Down
16 changes: 7 additions & 9 deletions android/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ arrow = "2.0.0"

# Compose
compose = "1.7.6"
compose-destinations = "2.1.0-beta14"
compose-destinations = "2.1.0-beta15"
compose-constraintlayout = "1.1.0"
compose-material3 = "1.3.1"

Expand All @@ -36,23 +36,23 @@ grpc-kotlin = "1.4.1"
grpc-kotlin-jar = "1.4.1:jdk8@jar"

# Koin
koin = "4.0.0"
koin-compose = "4.0.0"
koin = "4.0.1"
koin-compose = "4.0.1"

# Ktor
ktor = "3.0.2"
ktor = "3.0.3"

# Kotlin
# Bump kotlin and kotlin-ksp together, find matching release here:
# https://github.com/google/ksp/releases
kotlin = "2.1.0"
kotlin-ksp = "2.1.0-1.0.29"
kotlinx = "1.9.0"
kotlinx = "1.10.1"
kotlinx-serialization = "2.1.0"

# Protobuf
protobuf-gradle-plugin = "0.9.4"
protobuf = "4.29.1"
protobuf = "4.29.2"

# Misc
commonsvalidator = "1.9.0"
Expand All @@ -65,9 +65,7 @@ konsist = "0.17.3"
ktfmt = "0.21.0"
leakcanary = "2.14"

# Blocked updating to 1.13.13 due to regression
# https://github.com/mockk/mockk/issues/1308
mockk = "1.13.12"
mockk = "1.13.14"
mockwebserver = "4.12.0"
play-publisher = "3.12.1"
turbine = "1.2.0"
Expand Down
Loading

0 comments on commit 0951379

Please sign in to comment.