Skip to content

Commit d50051c

Browse files
committed
Merge branch 'trunk' into feat/CMM-886-create-logs-sharing-with-HE
# Conflicts: # WordPress/src/main/java/org/wordpress/android/support/he/ui/HENewTicketScreen.kt # WordPress/src/main/java/org/wordpress/android/support/he/ui/HESupportActivity.kt # WordPress/src/main/java/org/wordpress/android/support/he/ui/HESupportViewModel.kt
2 parents 7baacd2 + 7b13497 commit d50051c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ checkstyle = '10.17.0'
5151
coil = '2.7.0'
5252
commons-fileupload = '1.5'
5353
detekt = '1.23.8'
54-
dependency-analysis = '3.4.0'
54+
dependency-analysis = '3.4.1'
5555
facebook-react = '0.73.3'
5656
facebook-shimmer = '0.5.0'
5757
fastlane-screengrab = '2.1.1'
@@ -95,7 +95,7 @@ robolectric = '4.16'
9595
sentry = '5.12.1'
9696
squareup-java-poet = '1.13.0'
9797
squareup-kotlin-poet = '1.18.1'
98-
squareup-okhttp3 = '5.2.1'
98+
squareup-okhttp3 = '5.3.0'
9999
squareup-retrofit = '3.0.0'
100100
wellsql = '2.0.0'
101101
wordpress-aztec = 'v2.1.4'
@@ -106,7 +106,7 @@ wordpress-utils = '3.14.0'
106106
automattic-ucrop = '2.2.11'
107107
zendesk = '5.5.1'
108108
turbine = '1.2.1'
109-
commonmark = '0.24.0'
109+
commonmark = '0.27.0'
110110

111111
[libraries]
112112
airbnb-lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", version.ref = "airbnb-lottie" }

0 commit comments

Comments
 (0)