TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-24 00:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into closed_groups

Browse Source 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
#	libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt
This commit is contained in:
0x330a
2023-10-16 15:59:40 +11:00
parent aa2282cde5 9d02eb33c7
commit 9dfb6f84b7
16 changed files with 60 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsignal/build.gradle
View File

@@ -25,6 +25,6 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
implementation "nl.komponents.kovenant:kovenant:$kovenantVersion"
testImplementation "junit:junit:$junitVersion"
testImplementation "org.assertj:assertj-core:1.7.1"
testImplementation "org.assertj:assertj-core:3.11.1"
testImplementation "org.conscrypt:conscrypt-openjdk-uber:2.0.0"
}