oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

fix: build works now

This commit is contained in:
0x330a 2023-08-08 12:28:34 +10:00
parent 56a7bc6c8e
commit 22fa79fbe2
4 changed files with 30 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
app/build.gradle
View File

@ -39,7 +39,7 @@ dependencies {
kapt("com.google.dagger:hilt-android-compiler:2.44") kapt("com.google.dagger:hilt-android-compiler:2.44")
implementation "androidx.appcompat:appcompat:$appcompatVersion" implementation "androidx.appcompat:appcompat:$appcompatVersion"
implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation 'androidx.recyclerview:recyclerview:1.3.1'
implementation "com.google.android.material:material:$materialVersion" implementation "com.google.android.material:material:$materialVersion"
implementation 'com.google.android:flexbox:2.0.1' implementation 'com.google.android:flexbox:2.0.1'
implementation 'androidx.legacy:legacy-support-v13:1.0.0' implementation 'androidx.legacy:legacy-support-v13:1.0.0'
@ -47,7 +47,7 @@ dependencies {
implementation "androidx.preference:preference-ktx:$preferenceVersion" implementation "androidx.preference:preference-ktx:$preferenceVersion"
implementation 'androidx.legacy:legacy-preference-v14:1.0.0' implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
implementation 'androidx.gridlayout:gridlayout:1.0.0' implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation 'androidx.exifinterface:exifinterface:1.3.4' implementation 'androidx.exifinterface:exifinterface:1.3.6'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion" implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion" implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion"
@ -55,10 +55,10 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-process:$lifecycleVersion" implementation "androidx.lifecycle:lifecycle-process:$lifecycleVersion"
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
implementation "androidx.paging:paging-runtime-ktx:$pagingVersion" implementation "androidx.paging:paging-runtime-ktx:$pagingVersion"
implementation 'androidx.activity:activity-ktx:1.5.1' implementation 'androidx.activity:activity-ktx:1.7.2'
implementation 'androidx.fragment:fragment-ktx:1.5.3' implementation 'androidx.fragment:fragment-ktx:1.6.1'
implementation "androidx.core:core-ktx:$coreVersion" implementation "androidx.core:core-ktx:$coreVersion"
implementation "androidx.work:work-runtime-ktx:2.7.1" implementation "androidx.work:work-runtime-ktx:2.8.1"
implementation ("com.google.firebase:firebase-messaging:18.0.0") { implementation ("com.google.firebase:firebase-messaging:18.0.0") {
exclude group: 'com.google.firebase', module: 'firebase-core' exclude group: 'com.google.firebase', module: 'firebase-core'
exclude group: 'com.google.firebase', module: 'firebase-analytics' exclude group: 'com.google.firebase', module: 'firebase-analytics'
@ -132,12 +132,12 @@ dependencies {
testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
androidTestImplementation "org.mockito:mockito-android:$mockitoAndroidVersion" androidTestImplementation "org.mockito:mockito-android:$mockitoAndroidVersion"
androidTestImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" androidTestImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
// testImplementation "androidx.test:core:$testCoreVersion" testImplementation "androidx.test:core:$testCoreVersion"
testImplementation "androidx.arch.core:core-testing:2.2.0" testImplementation "androidx.arch.core:core-testing:2.2.0"
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion" testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion"
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion" androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion"
// Core library // Core library
androidTestImplementation "androidx.test:core:$testCoreVersion" androidTestImplementation("androidx.test:core:$testCoreVersion")
androidTestImplementation('com.adevinta.android:barista:4.2.0') { androidTestImplementation('com.adevinta.android:barista:4.2.0') {
exclude group: 'org.jetbrains.kotlin' exclude group: 'org.jetbrains.kotlin'
@ -145,21 +145,20 @@ dependencies {
// AndroidJUnitRunner and JUnit Rules // AndroidJUnitRunner and JUnit Rules
androidTestImplementation "androidx.test:runner:$testRunnerVersion" androidTestImplementation "androidx.test:runner:$testRunnerVersion"
androidTestImplementation 'androidx.test:rules:1.5.0' androidTestImplementation "androidx.test:rules:$testRulesVersion"
// Assertions // Assertions
androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation "androidx.test.ext:junit:1.1.5"
androidTestImplementation 'androidx.test.ext:truth:1.5.0' androidTestImplementation "androidx.test.ext:truth:$testExtTruthVersion"
androidTestImplementation 'com.google.truth:truth:1.1.3'
// Espresso dependencies // Espresso dependencies
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' androidTestImplementation "androidx.test.espresso:espresso-core:$testEspressoVersion"
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.1' androidTestImplementation "androidx.test.espresso:espresso-contrib:$testEspressoVersion"
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.1' androidTestImplementation "androidx.test.espresso:espresso-intents:$testEspressoVersion"
androidTestImplementation 'androidx.test.espresso:espresso-accessibility:3.5.1' androidTestImplementation "androidx.test.espresso:espresso-accessibility:$testEspressoVersion"
androidTestImplementation 'androidx.test.espresso:espresso-web:3.5.1' androidTestImplementation "androidx.test.espresso:espresso-web:$testEspressoVersion"
androidTestImplementation 'androidx.test.espresso.idling:idling-concurrent:3.5.1' androidTestImplementation "androidx.test.espresso.idling:idling-concurrent:$testEspressoVersion"
androidTestImplementation 'androidx.test.espresso:espresso-idling-resource:3.5.1' androidTestImplementation "androidx.test.espresso:espresso-idling-resource:$testEspressoVersion"
androidTestUtil 'androidx.test:orchestrator:1.4.2' androidTestUtil 'androidx.test:orchestrator:1.4.2'
testImplementation 'org.robolectric:robolectric:4.4' testImplementation 'org.robolectric:robolectric:4.4'
@ -187,7 +186,7 @@ def abiPostFix = ['armeabi-v7a' : 1,
'universal' : 5] 'universal' : 5]
android { android {
compileSdkVersion androidCompileSdkVersion compileSdk androidCompileSdkVersion
namespace 'network.loki.messenger' namespace 'network.loki.messenger'
useLibrary 'org.apache.http.legacy' useLibrary 'org.apache.http.legacy'
@ -338,9 +337,3 @@ def autoResConfig() {
kapt { kapt {
correctErrorTypes = true correctErrorTypes = true
} }
tasks.register("myConfigs") {
doLast {
configurations.forEach { println(it) }
}
}

2
app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.kt
View File

@ -50,7 +50,7 @@ class PrivacySettingsPreferenceFragment : ListSummaryPreferenceFragment() {
.setData(Uri.parse("package:" + BuildConfig.APPLICATION_ID)) .setData(Uri.parse("package:" + BuildConfig.APPLICATION_ID))
} }
.apply { addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) } .apply { addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) }
.takeIf { IntentUtils.isResolvable(requireContext(), it) }.let { .takeIf { IntentUtils.isResolvable(requireContext(), it) }?.let {
startActivity(it) startActivity(it)
} }
} }

19
gradle.properties
View File

@ -22,7 +22,7 @@ kotlinVersion=1.8.21
android.useAndroidX=true android.useAndroidX=true
appcompatVersion=1.6.1 appcompatVersion=1.6.1
coreVersion=1.10.1 coreVersion=1.10.1
coroutinesVersion=1.6.4 coroutinesVersion=1.7.1
curve25519Version=0.6.0 curve25519Version=0.6.0
daggerVersion=2.46.1 daggerVersion=2.46.1
glideVersion=4.11.0 glideVersion=4.11.0
@ -30,22 +30,21 @@ jacksonDatabindVersion=2.9.8
junitVersion=4.13.2 junitVersion=4.13.2
kotlinxJsonVersion=1.3.3 kotlinxJsonVersion=1.3.3
kovenantVersion=3.3.0 kovenantVersion=3.3.0
lifecycleVersion=2.5.1 lifecycleVersion=2.6.1
materialVersion=1.8.0 materialVersion=1.9.0
mockitoAndroidVersion=5.4.0 mockitoAndroidVersion=5.4.0
mockitoKotlinVersion=5.0.0 mockitoKotlinVersion=5.0.0
okhttpVersion=3.12.1 okhttpVersion=3.12.1
pagingVersion=3.0.0 pagingVersion=3.2.0
preferenceVersion=1.2.0 preferenceVersion=1.2.0
protobufVersion=2.5.0 protobufVersion=2.5.0
testCoreVersion=1.5.0 testCoreVersion=1.4.0
testEspressoVersion=3.5.1 testEspressoVersion=3.4.0
extJunitVersion=1.1.5 extJunitVersion=1.1.5
testMonitorVersion=1.6.1 testRunnerVersion=1.4.0
testRunnerVersion=1.5.2 testRulesVersion=1.4.0
testRulesVersion=1.5.0
testServicesVersion=1.4.2 testServicesVersion=1.4.2
testOrchestratorVersion=1.4.2 testOrchestratorVersion=1.4.2
testExtTruthVersion=1.5.0 testExtTruthVersion=1.4.0
testAnnotationVersion=1.0.1 testAnnotationVersion=1.0.1

4
libsession-util/build.gradle
View File

@ -42,6 +42,6 @@ dependencies {
testImplementation "junit:junit:$junitVersion" testImplementation "junit:junit:$junitVersion"
implementation(project(":libsignal")) implementation(project(":libsignal"))
implementation "com.google.protobuf:protobuf-java:$protobufVersion" implementation "com.google.protobuf:protobuf-java:$protobufVersion"
androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation "androidx.test.ext:junit:$extJunitVersion"
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' androidTestImplementation "androidx.test.espresso:espresso-core:$testEspressoVersion"
} }