Merge branch 'master' into feature/image_picker

MixinNetwork · Jan 23, 2025 · 9cc5306 · 9cc5306
2 parents 2f1f559 + 61e3b9b
commit 9cc5306
Show file tree

Hide file tree

Showing 106 changed files with 7,552 additions and 612 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -209,7 +209,7 @@ dependencies {
         exclude group: 'net.jcip', module: 'jcip-annotations'
     }
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
-    implementation platform("com.google.firebase:firebase-bom:33.7.0")
+    implementation platform("com.google.firebase:firebase-bom:33.8.0")
     implementation("com.google.firebase:firebase-perf")
     implementation fileTree(include: ['*.aar'], dir: 'libs')
     implementation "androidx.fragment:fragment-ktx:${fragmentVersion}"
@@ -391,7 +391,7 @@ dependencies {
     implementation "androidx.compose.runtime:runtime-livedata:${composeVersion}"
     implementation "androidx.compose.runtime:runtime-rxjava2:${composeVersion}"
     implementation "androidx.constraintlayout:constraintlayout-compose:${constraintLayoutComposeVersion}"
-    implementation 'androidx.activity:activity-compose:1.9.3'
+    implementation 'androidx.activity:activity-compose:1.10.0'
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:${composeVersion}"
 
     // accompanist
@@ -402,7 +402,7 @@ dependencies {
     // wallet connect && web3j
     implementation "org.web3j:core:4.11.0" // ⚠️ dependabot unexpected behavior update to version 5.0.0
     implementation "org.web3j:crypto:4.11.0"
-    implementation platform("com.reown:android-bom:1.1.0")
+    implementation platform("com.reown:android-bom:1.1.2")
     implementation "com.reown:android-core"
     implementation "com.reown:walletkit"
 

diff --git a/app/libs/mixin.aar b/app/libs/mixin.aar