Merge branch 'master' into develop

This commit is contained in:
Christian Basler 2016-01-24 09:38:47 +01:00
commit 3eabda29ee

View File

@ -29,17 +29,17 @@ Setup
Add Jabit as Gradle dependency:
```Gradle
compile 'ch.dissem.jabit:jabit-core:0.2.0'
compile 'ch.dissem.jabit:jabit-core:1.0.0'
```
Unless you want to implement your own, also add the following:
```Gradle
compile 'ch.dissem.jabit:jabit-networking:0.2.0'
compile 'ch.dissem.jabit:jabit-repositories:0.2.0'
compile 'ch.dissem.jabit:jabit-cryptography-bc:0.2.0'
compile 'ch.dissem.jabit:jabit-networking:1.0.0'
compile 'ch.dissem.jabit:jabit-repositories:1.0.0'
compile 'ch.dissem.jabit:jabit-cryptography-bc:1.0.0'
```
And if you want to import from or export to the Wallet Import Format (used by PyBitmessage) you might also want to add:
```Gradle
compile 'ch.dissem.jabit:jabit-wif:0.2.0'
compile 'ch.dissem.jabit:jabit-wif:1.0.0'
```
For Android clients use `jabit-cryptography-sc` instead of `jabit-cryptography-bc`.