From 1f48159ac8d4503528c9f64e1237c6f35bf3c96c Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 21 May 2024 08:41:08 -0700
Subject: [PATCH] fix: resolve syncing 31 stuck issue using dashj 20.0.5
 (#1285)

* chore: use dashj 20.0.5-SNAPSHOT

* fix: add protobuf dependency to sample-integration-android
---
 build.gradle                            | 2 +-
 sample-integration-android/build.gradle | 1 +
 wallet/build.gradle                     | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index ba0719bda9..b04b1e6d6f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         kotlin_version = '1.9.23'
         coroutinesVersion = '1.6.4'
         ok_http_version = '4.9.1'
-        dashjVersion = '20.0.4'
+        dashjVersion = '20.0.5-SNAPSHOT'
         hiltVersion = '2.51'
         hiltCompilerVersion = '1.2.0'
         hiltWorkVersion = '1.0.0'
diff --git a/sample-integration-android/build.gradle b/sample-integration-android/build.gradle
index 51bc13ad5f..26723b640f 100644
--- a/sample-integration-android/build.gradle
+++ b/sample-integration-android/build.gradle
@@ -10,6 +10,7 @@ dependencies {
     }
     implementation "org.dashj:dashj-core:$dashjVersion"
     implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'com.google.protobuf:protobuf-javalite:3.17.3'
 }
 
 android {
diff --git a/wallet/build.gradle b/wallet/build.gradle
index b82429b7c7..dee1f2c12a 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -46,8 +46,8 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-core-utils:1.0.0'
     implementation "androidx.work:work-runtime-ktx:$workRuntimeVersion"
     implementation "androidx.biometric:biometric:1.1.0"
-    implementation("androidx.activity:activity-compose:1.7.2")
 
+    implementation 'org.bouncycastle:bcprov-jdk15to18:1.74'
     implementation "org.dashj:dashj-core:$dashjVersion"
     implementation "org.dashj.android:dashj-bls-android:1.0.0"
     implementation "org.dashj.android:dashj-x11-android:0.17.5"
@@ -90,6 +90,7 @@ dependencies {
     implementation("androidx.compose.ui:ui-tooling-preview")
     implementation("androidx.compose.material3:material3")
     debugImplementation 'androidx.compose.ui:ui-tooling:1.0.0'
+    implementation("androidx.activity:activity-compose:1.7.2")
 
     // Navigation
     implementation "androidx.navigation:navigation-fragment-ktx:$navigationVersion"