Merge pull request #70 from notmandatory/fix_build

Fix build.sh kotlin copy for android, also a rust fmt fix
This commit is contained in:
Steve Myers 2021-11-04 17:47:52 -07:00 committed by GitHub
commit 01da0137ef
2 changed files with 4 additions and 2 deletions

View File

@ -122,7 +122,7 @@ build_android() {
fi
# copy sources
cp -R bindings/bdk-kotlin/jvm/src/main/ bindings/bdk-kotlin/android/src/main/
cp -R bindings/bdk-kotlin/jvm/src/main/kotlin bindings/bdk-kotlin/android/src/main
# bdk-kotlin aar
(cd bindings/bdk-kotlin && ./gradlew :android:build && ./gradlew :android:publishToMavenLocal)

View File

@ -100,7 +100,9 @@ impl From<&bdk::TransactionDetails> for Transaction {
details: TransactionDetails::from(x),
confirmation,
},
None => Transaction::Unconfirmed { details: TransactionDetails::from(x) },
None => Transaction::Unconfirmed {
details: TransactionDetails::from(x),
},
}
}
}