Skip to content

Commit 677da72

Browse files
committed
Merge remote-tracking branch 'origin/master' into feature/timed_refresh
# Conflicts: # app/src/main/java/one/mixin/android/repository/Web3Repository.kt # app/src/main/java/one/mixin/android/ui/common/LoginVerifyBottomSheetDialogFragment.kt # app/src/main/java/one/mixin/android/ui/tip/wc/sessionproposal/SessionProposalPage.kt # app/src/main/java/one/mixin/android/ui/tip/wc/sessionproposal/SessionProposalViewModel.kt # app/src/main/java/one/mixin/android/ui/tip/wc/sessionrequest/SessionRequestViewModel.kt # app/src/main/java/one/mixin/android/ui/wallet/ClassicWalletFragment.kt # app/src/main/java/one/mixin/android/ui/wallet/PrivacyWalletFragment.kt # app/src/main/java/one/mixin/android/ui/wallet/TransactionsFragment.kt # app/src/main/java/one/mixin/android/ui/wallet/WalletFragment.kt
2 parents bc2bc2b + 5d59ad9 commit 677da72

File tree

214 files changed

+10031
-1792
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+10031
-1792
lines changed

app/build.gradle

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ plugins {
1111
id "com.google.protobuf" version "0.9.1"
1212
id "org.jetbrains.kotlin.plugin.compose" version "${kotlinVersion}"
1313
id 'com.google.firebase.firebase-perf'
14+
id 'com.bugsnag.android.gradle'
1415

15-
id 'io.sentry.android.gradle' version '5.9.0'
1616
}
1717

1818
def versionMajor = 3
19-
def versionMinor = 3
19+
def versionMinor = 4
2020
def versionPatch = 0
21-
def versionBuild = 14
21+
def versionBuild = 3
2222

2323
apply plugin: 'com.google.gms.google-services'
2424
apply plugin: 'com.google.firebase.crashlytics'
@@ -29,7 +29,7 @@ android {
2929
namespace "one.mixin.android"
3030
defaultConfig {
3131
applicationId "one.mixin.messenger"
32-
minSdkVersion 24
32+
minSdkVersion 26
3333
targetSdkVersion 35
3434
versionCode versionMajor * 1000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
3535
versionName "${versionMajor}.${versionMinor}.${versionPatch}"
@@ -219,6 +219,10 @@ android {
219219
}
220220
}
221221

222+
bugsnag {
223+
uploadNdkMappings = false
224+
}
225+
222226
ksp {
223227
arg("room.schemaLocation", "$projectDir/schemas")
224228
arg("room.incremental", "true")
@@ -416,7 +420,7 @@ dependencies {
416420
implementation "androidx.constraintlayout:constraintlayout-compose:${constraintLayoutComposeVersion}"
417421
implementation "androidx.activity:activity-compose:${activityComposeVersion}"
418422
androidTestImplementation "androidx.compose.ui:ui-test-junit4:${composeVersion}"
419-
423+
420424
// accompanist
421425
implementation "com.google.accompanist:accompanist-navigation-animation:${accompanistVersion}"
422426
implementation "com.google.accompanist:accompanist-pager:${accompanistVersion}"
@@ -506,6 +510,7 @@ dependencies {
506510
implementation "com.android.installreferrer:installreferrer:$installreferrerVersion"
507511
implementation "com.android.billingclient:billing:$billingVersion"
508512
implementation "com.android.billingclient:billing-ktx:$billingVersion"
513+
implementation "com.bugsnag:bugsnag-android:$bugsnagVersion"
509514
}
510515

511516
composeCompiler {
@@ -551,20 +556,4 @@ task syncStrings {
551556
}
552557

553558

554-
import io.sentry.android.gradle.extensions.InstrumentationFeature
555-
sentry {
556-
org = "mcwm"
557-
projectName = "android"
558-
559-
autoUploadProguardMapping = false
560-
autoUploadNativeSymbols = false
561559

562-
tracingInstrumentation {
563-
enabled = true
564-
features = EnumSet.allOf(InstrumentationFeature) - InstrumentationFeature.OKHTTP
565-
features = EnumSet.allOf(InstrumentationFeature) - InstrumentationFeature.FILE_IO
566-
logcat {
567-
enabled = false
568-
}
569-
}
570-
}

app/libs/mixin.aar

7.09 MB
Binary file not shown.

0 commit comments

Comments
 (0)