Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: syncing 31 #1285

Merged
merged 6 commits into from
May 21, 2024
Merged

fix: syncing 31 #1285

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f0469dc
Revert "chore: remove shared debug key (#1269)"
HashEngineering May 6, 2024
fe2c2f0
chore: use dashj 20.0.5-SNAPSHOT
HashEngineering May 8, 2024
ebdfda1
Merge branch 'master' into bugfix-syncing-31
HashEngineering May 16, 2024
ba5479c
fix: add protobuf dependency to sample-integration-android
HashEngineering May 21, 2024
1ce55a7
Revert "Revert "chore: remove shared debug key (#1269)""
HashEngineering May 21, 2024
0c7e6d5
fix: revert versionCode changes
HashEngineering May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
14 changes: 12 additions & 2 deletions wallet/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -191,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']
Expand Down Expand Up @@ -220,6 +221,15 @@ android {
}
}

signingConfigs {
debug {
storeFile file('keystore/debug.keystore')
storePassword "android"
keyAlias "androiddebugkey"
keyPassword "android"
}
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't we remove the leaked debug key recently?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, thanks for catching this. I needed to add this back for working with an install that was built using the old debug key. It will be removed before merging.

buildTypes {
all {
minifyEnabled true
Expand Down
Binary file added wallet/keystore/debug.keystore
View file
Open in desktop
Binary file not shown.
Loading