Skip to content

Commit

Permalink
Merge branch 'molly-7.32'
Browse files Browse the repository at this point in the history
  • Loading branch information
valldrac committed Feb 3, 2025
2 parents c7505ed + 8a97af1 commit d9c3c5f
Show file tree
Hide file tree
Showing 906 changed files with 25,509 additions and 11,895 deletions.
9 changes: 6 additions & 3 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ plugins {
id("molly")
}

val canonicalVersionCode = 1501
val canonicalVersionName = "7.29.4"
val canonicalVersionCode = 1509
val canonicalVersionName = "7.32.2"
val currentHotfixVersion = 0
val maxHotfixVersions = 100
val mollyRevision = 1
Expand Down Expand Up @@ -426,6 +426,7 @@ dependencies {
implementation(project(":core-ui"))

implementation(libs.androidx.fragment.ktx)
implementation(libs.androidx.fragment.compose)
implementation(libs.androidx.appcompat) {
version {
strictly("1.6.1")
Expand Down Expand Up @@ -558,16 +559,18 @@ dependencies {
}
}
testImplementation(testLibs.conscrypt.openjdk.uber)
testImplementation(testLibs.hamcrest.hamcrest)
testImplementation(testLibs.mockk)
testImplementation(testFixtures(project(":libsignal-service")))
testImplementation(testLibs.espresso.core)

androidTestImplementation(platform(libs.androidx.compose.bom))
androidTestImplementation(libs.androidx.compose.ui.test.junit4)
androidTestImplementation(testLibs.androidx.test.ext.junit)
androidTestImplementation(testLibs.espresso.core)
androidTestImplementation(testLibs.androidx.test.core)
androidTestImplementation(testLibs.androidx.test.core.ktx)
androidTestImplementation(testLibs.androidx.test.ext.junit.ktx)
androidTestImplementation(testLibs.assertk)
androidTestImplementation(testLibs.mockk.android)
androidTestImplementation(testLibs.square.okhttp.mockserver)
androidTestImplementation(testLibs.diff.utils)
Expand Down
1 change: 0 additions & 1 deletion app/proguard/proguard-automation.pro
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
-dontwarn sun.reflect.**
-dontwarn sun.misc.**
-dontwarn assertk.**
-dontwarn org.hamcrest.**
-dontwarn com.squareup.**

-dontobfuscate
Binary file modified app/src/androidTest/assets/backupTests/account_data_00.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_01.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_02.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_03.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_04.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_05.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_06.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_07.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_08.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_09.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_10.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_11.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_12.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_13.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_14.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_15.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_16.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_17.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_18.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_19.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_20.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_21.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_22.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_23.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_24.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_25.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_26.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_27.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/ad_hoc_call_00.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/ad_hoc_call_01.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/ad_hoc_call_02.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_00.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_01.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_02.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_03.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_04.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_05.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_06.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_07.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_08.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_09.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_10.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_11.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_12.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_13.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_14.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_15.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_16.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_17.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_18.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_19.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_20.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_21.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_22.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_23.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_24.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_25.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_26.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_folder_00.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_folder_01.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_folder_02.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_folder_03.binproto
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit d9c3c5f

Please sign in to comment.