From f0469dcde7c1d27bf9d0c57458f203a0149fefa4 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Sun, 5 May 2024 23:26:06 -0700 Subject: [PATCH 1/5] Revert "chore: remove shared debug key (#1269)" This reverts commit c3972e90f704fa3c2f8f699d95d842c65af7c170. --- wallet/build.gradle | 9 +++++++++ wallet/keystore/debug.keystore | Bin 0 -> 1259 bytes 2 files changed, 9 insertions(+) create mode 100644 wallet/keystore/debug.keystore diff --git a/wallet/build.gradle b/wallet/build.gradle index 666a43f5c9..3123160116 100644 --- a/wallet/build.gradle +++ b/wallet/build.gradle @@ -215,6 +215,15 @@ android { } } + signingConfigs { + debug { + storeFile file('keystore/debug.keystore') + storePassword "android" + keyAlias "androiddebugkey" + keyPassword "android" + } + } + buildTypes { all { minifyEnabled true diff --git a/wallet/keystore/debug.keystore b/wallet/keystore/debug.keystore new file mode 100644 index 0000000000000000000000000000000000000000..33f2604f6d12ea1c3333a1c12f651e46534693fc GIT binary patch literal 1259 zcmezO_TO6u1_mY|W&~sY#JrTE{LGY;)TGk%?9@u2c&gs^&=#PYT?S1|+YI>FxU|_A zSs1mL1Q{7w8CaT_7VXdI`!|!n>*}t=$ftMsr$_BM9;`i=xpr&lMJJ1iv%Pz6PS`m4 zr>4X-A^XGnRXuOSD>-lNon<*SF08Uhy!gVyu&9EJ+pR~d^w$Rd4&1MEa?!TP?n0`J?vQ?kQQulWp-nCjNwW9Ds=z7(5;Nd2OGbzJm3~N7Om>bW1V|2J3X4CT4tT&>;7dM z-c%=k5J*3DCFz8d+q5_5c2E3}>O9BLY}3{fZttvboi1{`ACe|~ez+%Z(c?#+$9YEHmu%o?cA4tGEdu&UNw#Oj6c9q%*?EF^5O0&$4Uxhu8Z!? zwOv@BX{dXwAX3;)yhI{z$5IcO;D0kk^B>w~&C>78FEeb(3ac{x@ah_8>5I?b+2;8D z`EtqPH|qq~hre35X6~A4G<9YA-o)y&r<#u$ekfq&{f;~q>ASrX1H8m=xVp;K*Eg6UsM>6Xx+SPU|eL!aja3!`s7)w zw{PzDCuoQ4`L1|K@40o`9Loi(-X3My@a*TN=7)mKUtA)~-UZ#SFyEzc_l&aeUk$Z+ z{)+@twkU^IS!CP2U%_)y_1Kg4KD#Gukw4{U?|7jZpqA+T`tqZDTiYYEw^t{W%r*Vi z{{DTxo%HOwOT2QDk6B(%c@2sL@*#PfR)Lc? zYlNPufh90OKQw4!ybHu`OpJ^Mylk9WZ60mkd4Z{!mBGN=P|QGtjX9KsnTOXAk`)wO zKzYGX0GRZF;#@rJP;ot>l5FL8y@f6S?U%XZBs$*Wp2Wew502$jy#HX6 zHF0g}&2zkSU$VEwaxJsCA1Y+@Vm4EWw*KGsEG(;5G(Tmid@N;O_Ivq~mCiLzAA~e^ zJ>mHoU>$o~K(}xI=R;d1PM$a)Zv8r8zwLhCiYNP5G#?3-iJo=))z$o|8?ry&wy~OVwWc>6@j(bv!XhyHR1gNxEKR9nXiO*N&-5@%x{j{j7e2?dhZw z9M;~AbGIvAIB3Ut_o%qaoMVfuE@jL*AeH3y|K+jQ3lmK2<(yO=uTh)BY^UCNTQ#$; zy#DE$t#=>s#f#beHB~s)q_ Date: Tue, 7 May 2024 22:13:10 -0700 Subject: [PATCH 2/5] chore: use dashj 20.0.5-SNAPSHOT --- build.gradle | 2 +- wallet/build.gradle | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 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/wallet/build.gradle b/wallet/build.gradle index 3123160116..aeab44a788 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" @@ -85,6 +85,12 @@ dependencies { ksp "com.github.bumptech.glide:compiler:$glideVersion" implementation 'com.github.MikeOrtiz:TouchImageView:3.0.3' implementation "io.coil-kt:coil:$coilVersion" + implementation(platform("androidx.compose:compose-bom:2023.03.00")) + implementation("androidx.compose.ui:ui") + 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" @@ -186,7 +192,7 @@ android { compileSdk 33 minSdkVersion 24 targetSdkVersion 33 - versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 101000 + versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 101001 versionName project.hasProperty('versionName') ? project.property('versionName') : "10.1.0" multiDexEnabled true generatedDensities = ['hdpi', 'xhdpi'] From ba5479cc96b7ad0987651d2ca6dbb92c3092ff92 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Tue, 21 May 2024 08:12:41 -0700 Subject: [PATCH 3/5] fix: add protobuf dependency to sample-integration-android --- sample-integration-android/build.gradle | 1 + 1 file changed, 1 insertion(+) 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 { From 1ce55a7201be49f67a7c0ba0198717b5185bdb2d Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Tue, 21 May 2024 08:21:04 -0700 Subject: [PATCH 4/5] Revert "Revert "chore: remove shared debug key (#1269)"" This reverts commit f0469dcde7c1d27bf9d0c57458f203a0149fefa4. --- wallet/build.gradle | 9 --------- wallet/keystore/debug.keystore | Bin 1259 -> 0 bytes 2 files changed, 9 deletions(-) delete mode 100644 wallet/keystore/debug.keystore diff --git a/wallet/build.gradle b/wallet/build.gradle index 3f1b926634..367e567582 100644 --- a/wallet/build.gradle +++ b/wallet/build.gradle @@ -221,15 +221,6 @@ android { } } - signingConfigs { - debug { - storeFile file('keystore/debug.keystore') - storePassword "android" - keyAlias "androiddebugkey" - keyPassword "android" - } - } - buildTypes { all { minifyEnabled true diff --git a/wallet/keystore/debug.keystore b/wallet/keystore/debug.keystore deleted file mode 100644 index 33f2604f6d12ea1c3333a1c12f651e46534693fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1259 zcmezO_TO6u1_mY|W&~sY#JrTE{LGY;)TGk%?9@u2c&gs^&=#PYT?S1|+YI>FxU|_A zSs1mL1Q{7w8CaT_7VXdI`!|!n>*}t=$ftMsr$_BM9;`i=xpr&lMJJ1iv%Pz6PS`m4 zr>4X-A^XGnRXuOSD>-lNon<*SF08Uhy!gVyu&9EJ+pR~d^w$Rd4&1MEa?!TP?n0`J?vQ?kQQulWp-nCjNwW9Ds=z7(5;Nd2OGbzJm3~N7Om>bW1V|2J3X4CT4tT&>;7dM z-c%=k5J*3DCFz8d+q5_5c2E3}>O9BLY}3{fZttvboi1{`ACe|~ez+%Z(c?#+$9YEHmu%o?cA4tGEdu&UNw#Oj6c9q%*?EF^5O0&$4Uxhu8Z!? zwOv@BX{dXwAX3;)yhI{z$5IcO;D0kk^B>w~&C>78FEeb(3ac{x@ah_8>5I?b+2;8D z`EtqPH|qq~hre35X6~A4G<9YA-o)y&r<#u$ekfq&{f;~q>ASrX1H8m=xVp;K*Eg6UsM>6Xx+SPU|eL!aja3!`s7)w zw{PzDCuoQ4`L1|K@40o`9Loi(-X3My@a*TN=7)mKUtA)~-UZ#SFyEzc_l&aeUk$Z+ z{)+@twkU^IS!CP2U%_)y_1Kg4KD#Gukw4{U?|7jZpqA+T`tqZDTiYYEw^t{W%r*Vi z{{DTxo%HOwOT2QDk6B(%c@2sL@*#PfR)Lc? zYlNPufh90OKQw4!ybHu`OpJ^Mylk9WZ60mkd4Z{!mBGN=P|QGtjX9KsnTOXAk`)wO zKzYGX0GRZF;#@rJP;ot>l5FL8y@f6S?U%XZBs$*Wp2Wew502$jy#HX6 zHF0g}&2zkSU$VEwaxJsCA1Y+@Vm4EWw*KGsEG(;5G(Tmid@N;O_Ivq~mCiLzAA~e^ zJ>mHoU>$o~K(}xI=R;d1PM$a)Zv8r8zwLhCiYNP5G#?3-iJo=))z$o|8?ry&wy~OVwWc>6@j(bv!XhyHR1gNxEKR9nXiO*N&-5@%x{j{j7e2?dhZw z9M;~AbGIvAIB3Ut_o%qaoMVfuE@jL*AeH3y|K+jQ3lmK2<(yO=uTh)BY^UCNTQ#$; zy#DE$t#=>s#f#beHB~s)q_ Date: Tue, 21 May 2024 08:22:33 -0700 Subject: [PATCH 5/5] fix: revert versionCode changes --- wallet/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wallet/build.gradle b/wallet/build.gradle index 367e567582..dee1f2c12a 100644 --- a/wallet/build.gradle +++ b/wallet/build.gradle @@ -192,7 +192,7 @@ android { compileSdk 33 minSdkVersion 24 targetSdkVersion 33 - versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 101001 + versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 101000 versionName project.hasProperty('versionName') ? project.property('versionName') : "10.1.0" multiDexEnabled true generatedDensities = ['hdpi', 'xhdpi']