Merge branch 'trunk' into issue/self-hosted-user-ui

wordpress-mobile · Oct 3, 2024 · 1dfd403 · 1dfd403
2 parents 59585ca + b722f6d
commit 1dfd403
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -605,7 +605,7 @@ dependencyAnalysis {
     issues {
         onUnusedDependencies {
             // This dependency is actually needed otherwise the app will crash with a runtime exception.
-            exclude("org.greenrobot:eventbus")
+            exclude(libs.greenrobot.eventbus.main.get().module.toString())
             // This dependency is actually needed because otherwise UI tests fail to run (but do compile).
             exclude(libs.mockito.android.get().module.toString())
         }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ agp = '8.5.1'
 airbnb-lottie = '6.5.2'
 android-desugar = '2.1.2'
 android-installreferrer = '2.2'
-android-security-lint = '1.0.1'
+android-security-lint = '1.0.2'
 android-volley = '1.2.1'
 androidx-activity = '1.9.2'
 androidx-annotation = '1.8.2'
@@ -29,7 +29,7 @@ androidx-test-ext = '1.2.1'
 androidx-test-main = '1.5.0'
 androidx-test-uiautomator = '2.3.0'
 androidx-viewpager2 = '1.1.0'
-androidx-webkit = '1.12.0'
+androidx-webkit = '1.12.1'
 androidx-work = "2.9.1"
 apache-commons-text = '1.12.0'
 apache-http-client-android = '4.3.5.1'
@@ -52,7 +52,7 @@ fladle = '0.17.5'
 google-dagger = "2.50"
 google-exoplayer = '2.13.3'
 google-flexboxlayout = '3.0.0'
-google-firebase-bom = '33.3.0'
+google-firebase-bom = '33.4.0'
 google-firebase-iid = '21.1.0'
 google-gson = '2.11.0'
 google-material = '1.12.0'
@@ -77,7 +77,7 @@ kotlin-compile-testing = "1.5.0"
 kotlinx-coroutines = '1.8.1'
 kotlinx-kover = '0.7.6'
 ksp = '1.9.24-1.0.20'
-mockito-android = '5.13.0'
+mockito-android = '5.14.1'
 mockito-kotlin = '4.1.0'
 mpandroidchart = 'v3.1.0'
 photoview = '2.3.0'