[bisq-network/bisq] Define more version variables, fix style problems (#3092)

[Stan]

Define fontawesomefx version variables.

Fix testCompile org.mockito:mockito-core syntax.
You can view, comment on, or merge this pull request online at:

  https://github.com/bisq-network/bisq/pull/3092

-- Commit Summary --

  * Fix merge conficts
  * Merge branch 'master' of https://github.com/ghubstan/bisq
  * Merge remote-tracking branch 'upstream/master'

-- File Changes --

    M build.gradle (17)

-- Patch Links --

https://github.com/bisq-network/bisq/pull/3092.patch
https://github.com/bisq-network/bisq/pull/3092.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/bisq-network/bisq/pull/3092
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20190814/ffd8df11/attachment-0001.html>