Commit Graph

424 Commits

Author SHA1 Message Date
ghubstan
7b2ba53b66
Define more version variables, fix style problems
Define fontawesomefx version variables.

Fix testCompile org.mockito:mockito-core syntax.
2019-08-16 11:18:41 -03:00
battleofwizards
0a7dd4db15
Update protobuf to fix annoying warnings
Protobuf got updated to the latest released version 3.9.1.
The main motivation was to fix the following annoying warnings:

WARNING: An illegal reflective access operation has occurred
WARNING: Illegal reflective access by com.google.protobuf.UnsafeUtil (file:/home/qertoip/.gradle/caches/modules-2/files-2.1/com.google.protobuf/protobuf-java/3.5.1/8c3492f7662fa1cbf8ca76a0f5eb1146f7725acd/protobuf-java-3.5.1.jar) to field java.nio.Buffer.address
WARNING: Please consider reporting this to the maintainers of com.google.protobuf.UnsafeUtil
WARNING: Use --illegal-access=warn to enable warnings of further illegal reflective access operations
WARNING: All illegal access operations will be denied in a future release

Additionally, protobuf-gradle-plugin got updated to 0.8.10.
2019-08-16 14:13:47 +02:00
Florian Reimair
c80ab946fb
Merge branch 'master' into master 2019-08-14 19:15:29 +02:00
Florian Reimair
4eb88404b5
Merge pull request #3087 from battleofwizards/gradle-installdist-remove-useless-deletions
Remove legacy hack from build.gradle installDist task
2019-08-14 18:54:49 +02:00
battleofwizards
9ef7f89ffd
Remove legacy hack from build.gradle installDist task
The rationale for the "delete fileTree" hack no longer exists
because the conflicting files are not created anymore.
2019-08-14 14:20:54 +02:00
Christoph Sturm
9278ad021b don't force jdk 10 on developers 2019-08-13 19:59:12 +02:00
Christoph Sturm
0babe82d09 remove jmockit 2019-08-13 19:47:40 +02:00
Christoph Sturm
5da7ca21fa remove powermock from gradle file 2019-08-13 19:34:54 +02:00
Christoph Sturm
17221cbed8 remove more powermock and jmockit tests.
ignore 2 or 3 tests that are not possible to convert now
2019-08-13 19:30:57 +02:00
Christoph Sturm
e9a45196a8 remove powermock from core. 2019-08-13 18:13:10 +02:00
Christoph Sturm
9a587609dd WIP remove powermock 2019-08-13 18:08:33 +02:00
ghubstan
4ed65c229f
Merge remote-tracking branch 'upstream/master'
Bump guice version to 4.2.2
2019-08-13 11:44:00 -03:00
sqrrm
e52c255446
Merge pull request #3058 from christophsturm/bump-guice
use singleton annotation instead of binding as singleton
2019-08-13 15:19:41 +02:00
ghubstan
623a1db1e7
Fix merge conflict
Bump netlayerVersion to  0.6.5.1
2019-08-09 14:49:12 -03:00
ghubstan
2709e61875
Merge remote-tracking branch 'upstream/master' 2019-08-09 14:45:57 -03:00
sqrrm
89072d941f
Merge pull request #3048 from freimair/tor_0.4.0.5
Update Tor to 0.4.0.5
2019-08-09 15:59:24 +02:00
Christoph Atteneder
89073316c9
Merge branch 'master' of github.com:bisq-network/bisq into hotfix-v1.1.5
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
2019-08-08 11:19:51 +02:00
Christoph Atteneder
a56b367476
Revert to SNAPSHOT version 2019-08-08 10:34:06 +02:00
Christoph Atteneder
3bf3ff83b9
Bump version number 2019-08-08 09:54:54 +02:00
ghubstan
5f3d7f52c2
Merge remote-tracking branch 'upstream/master' 2019-08-06 14:27:38 -03:00
Christoph Sturm
20e011178e bump guice version and start testing desktop guice setup 2019-08-06 17:44:47 +02:00
ghubstan
3f7795b926
Define missing dependency version variables
Created version variables in build.gradle where missing,
but not touching hard coded overrides in subprojects.

Alphanumerically ordered version variables.

Used IDE code formatter, changing top line of file.
2019-08-03 16:00:55 -03:00
Florian Reimair
ad0724b97d
Update tor to 0.4.0.5 2019-08-02 13:45:53 +02:00
Christoph Sturm
18115c98f2
Update build.gradle
Co-Authored-By: sqrrm <sqrrm@users.noreply.github.com>
2019-08-01 13:44:07 +02:00
Christoph Sturm
ba1d493caf test the seednode's guice setup 2019-08-01 13:12:37 +02:00
Christoph Atteneder
db25293d62
Merge branch 'master' of github.com:bisq-network/bisq into hotfix-for-v1.1.3
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
2019-07-29 19:00:37 +02:00
Christoph Sturm
60d5b4ec5a fix type 2019-07-29 15:44:37 +02:00
Christoph Sturm
14f1580c8a add comment 2019-07-29 15:44:24 +02:00
Christoph Atteneder
d7cdd4be5c
Revert to SNAPSHOT version 2019-07-29 15:41:41 +02:00
Christoph Sturm
a3c814797d force jdk 10 on build to avoid confusion when some tests fail. 2019-07-29 09:53:19 +02:00
Christoph Atteneder
d498e43415
Bump version number 2019-07-26 10:41:47 +02:00
Christoph Atteneder
a2c19fa785
Revert to SNAPSHOT version 2019-07-15 16:35:49 +02:00
Christoph Atteneder
59be5bc94e
Bump version number 2019-07-15 16:33:55 +02:00
Christoph Atteneder
5b841709d4
Revert to SNAPSHOT version 2019-06-04 10:53:42 +02:00
Christoph Atteneder
ca24ce0217
Bump version number 2019-06-04 10:49:00 +02:00
Oscar Guindzberg
aded4afdf3 Use bitcoinj with connection handling audit fixes + Transaction.unCache() set confidence to null 2019-05-09 18:23:08 -03:00
Christoph Atteneder
8a25bb86c7
Fix broken SNAPSHOT renaming 2019-05-06 11:29:45 +02:00
Christoph Atteneder
98a7748a01
Revert to SNAPSHOT version 2019-05-06 10:55:09 +02:00
Christoph Atteneder
ac68da1dd3
Bump version number 2019-05-06 10:47:01 +02:00
Christoph Atteneder
36c0e49504
Revert to SNAPSHOT version 2019-05-03 12:47:59 +02:00
Christoph Atteneder
8ceb2e3be2
Bump version number 2019-05-03 12:13:41 +02:00
Christoph Atteneder
36f8b0275a
Revert to SNAPSHOT version 2019-04-16 16:26:41 +02:00
Christoph Atteneder
bdf163ca2d
Bump version number 2019-04-16 16:03:12 +02:00
Devin Bileck
eebb485096
Add missing pricenode project
When generating shell scripts in the root project directory, the
pricenode project was missing.
2019-04-16 00:47:34 -07:00
Christoph Atteneder
60826a11e1
Revert to SNAPSHOT 2019-04-15 17:42:16 +02:00
Christoph Atteneder
2c106c74c6
Bump version number 2019-04-12 12:09:49 +02:00
Christoph Atteneder
ee7864bc34
Revert to SNAPSHOT versions 2019-04-08 12:12:01 +02:00
Christoph Atteneder
f9a0dd1502
Bump version number 2019-04-08 12:10:59 +02:00
Christoph Atteneder
7f2e406e8d
Revert to SNAPSHOT versions 2019-04-02 17:25:03 +02:00
Christoph Atteneder
0ffc93a091
Bump version number 2019-04-02 17:13:04 +02:00
Christoph Atteneder
21e63066af
Revert to SNAPSHOT versions 2019-04-02 11:21:11 +02:00
Christoph Atteneder
fb3c8c214e
Bump version number 2019-04-02 11:19:03 +02:00
Oscar Guindzberg
fcbbec6497 Use the latest bisq's bitcoinj (00298b1) 2019-03-29 20:38:13 -03:00
Florian Reimair
bb6de99385
Update Netlayer to 0.6.5 2019-03-25 15:42:21 +01:00
Oscar Guindzberg
1746b143be Upgrade bitcoinj version to the one built with jdk 10 2019-03-19 17:16:49 -03:00
Oscar Guindzberg
aee1c6fa31 Move clear blockstore feature to bitcoinj 2019-03-19 15:27:55 -03:00
Manfred Karrer
80fa5c029f
Merge pull request #2507 from freimair/monitor
Monitor tweaks, fixes and a new Metric
2019-03-07 10:46:41 -05:00
Florian Reimair
1ff7f008cd
Introduced netlayer 0.6.4 2019-03-07 13:29:12 +01:00
Florian Reimair
004634ed23
Cleanup monitor gradle 2019-03-07 12:53:16 +01:00
Manfred Karrer
76e753f35a
Merge pull request #2478 from oscarguindzberg/bitcoinj-0.14.7
Use bitcoinj 0.14.7
2019-03-06 18:43:41 -05:00
Manfred Karrer
ab921b5c97
Merge pull request #2499 from freimair/netlayer_tweaks
WIP Updated netlayer, jtorctl and tor-binary
2019-03-06 17:50:06 -05:00
Christoph Atteneder
d6fb97880a
Revert to SNAPSHOT 2019-03-06 15:37:23 +01:00
Florian Reimair
7b4caab93d
Introduced netlayer 0.6.4b3 2019-03-06 13:47:32 +01:00
Christoph Atteneder
75fd991b3b
Bump version number 2019-03-06 10:04:50 +01:00
Florian Reimair
c1ab900521
Updated netlayer, jtorctl and tor-binary 2019-03-05 15:39:51 +01:00
Oscar Guindzberg
6c09a671a5 Exclude bitcoinj dependencies in conflict with bisq dependency version 2019-02-28 15:20:37 -03:00
Oscar Guindzberg
14e605790f Use bitcoinj 0.14.7 (commit 3e7ff3a) 2019-02-28 15:18:54 -03:00
Christoph Atteneder
25498a9e1a
Revert to SNAPSHOT release 2019-02-21 23:16:23 +01:00
Christoph Atteneder
d31173bc4f
Update version number for v0.9.4 2019-02-21 22:34:36 +01:00
Oscar Guindzberg
52e36187d1 Remove libdohj dependency 2019-02-05 09:33:58 -03:00
Manfred Karrer
159a5e5f65
Merge pull request #2348 from freimair/monitor
Monitor release: Showing off
2019-02-01 13:13:53 +01:00
Christoph Atteneder
fe864724f3
Configure jMockit for desktop module 2019-01-11 16:59:18 +01:00
Florian Reimair
b5a799470a P2P roundtriptime metric init 2019-01-09 11:52:16 +01:00
Christoph Atteneder
d320380e80
Set back to SNAPSHOT 2019-01-08 19:56:23 +01:00
Christoph Atteneder
b18a143c0c
Bump version number 2019-01-08 19:54:33 +01:00
Christoph Atteneder
307a5b8822
Set back to SNAPSHOT 2019-01-08 16:48:22 +01:00
Christoph Atteneder
d6543377cf
Bump version number 2019-01-08 16:37:28 +01:00
Oscar Guindzberg
f4a40ca6f6 Be able to upgrade bitcoinj without upgrading libdohj 2019-01-03 15:57:26 -03:00
Oscar Guindzberg
257a8627e6 Remove "pricenode" direct dependency on "assets"
It depends on "assets" already because it is a depencendy of "core"
2019-01-03 14:49:45 -03:00
Florian Reimair
bd0cf85f16 Introduce netlayer release 0.6.3 2019-01-03 17:11:21 +01:00
Manfred Karrer
975643aa56
Revert to netlayer 0.6 because of an issue with seednodes
If a seednode is using netwlayer version 0.6.2 (or 0.6.1) it is not
reachable from other nodes. Still unclear what causes that and if it
would affect also normal Bisq nodes, but to be careful we revert to
latest stable netlayer version which fixes the issue.
2019-01-03 14:18:57 +01:00
Florian Reimair
decd648a41 Merge branch 'monitor-nits' of git://github.com/ManfredKarrer/bisq into ManfredKarrer-monitor-nits 2018-12-30 10:44:41 +01:00
Florian Reimair
cfec7146a2 Merge branch 'master' into monitor 2018-12-30 09:52:10 +01:00
Manfred Karrer
579d1f101d
Use 1.1.10 instead of $logbackVersion
$logbackVersion causes build errors.
2018-12-29 14:18:37 +01:00
Manfred Karrer
69b168eaee
Add guava 2018-12-29 14:16:10 +01:00
Florian Reimair
f329370bae Fixed compiation error as in: Commit of shame 2018-12-29 13:20:13 +01:00
Florian Reimair
59e52851f7 Dependencies and Buildfile cleanup 2018-12-29 11:37:48 +01:00
Florian Reimair
6309908e0d Update Netlayer to 0.6.2 and thus, Tor to 8.0.4 2018-12-21 14:56:21 +01:00
Florian Reimair
b38f31239a Use same private_key in NewTor and RunningTor mode 2018-12-21 13:46:32 +01:00
Florian Reimair
d46813c866 TorHiddenServiceStartupTime Metric available 2018-12-21 11:35:26 +01:00
Florian Reimair
295cb6c2b8 Graceful shutdown, Netlayer 0.6.2 2018-12-21 11:34:29 +01:00
Florian Reimair
414623ba9f Introduce general purpose Tor instance 2018-12-18 11:46:03 +01:00
Christoph Atteneder
517429e8df
Set SNAPSHOT again 2018-12-13 14:32:05 +01:00
Christoph Atteneder
bab3376c41
Set back version number because of test failures on Travis 2018-12-13 14:28:12 +01:00
Christoph Atteneder
71e2a92ade
Set SNAPSHOT again 2018-12-13 14:01:02 +01:00
Christoph Atteneder
50d4c6c1fc
Bump version number 2018-12-13 13:59:08 +01:00
Florian Reimair
6481543600 Configure gradle properly 2018-12-11 12:20:31 +01:00
Manfred Karrer
cad0156617
Update btcd-cli4j to 0.5.8.4 (commit hash 065d3786)
- Log btcd-cli4j version
- Update witness
- Update findbugs to 3.0.2
2018-12-09 13:38:08 +01:00
Manfred Karrer
9389a8e1fa
Update checkpoint files
We used checkpoint files from BitcoinJ 0.14.4 and those caused a very
slow initial download. I tested with the WalletAppKit and different
release version sof BitcoinJ and could reproduce the behaviour there.
WIth v0.14.5 it was much better. But also that caused slow startup in
Bisq. After creating a current checkpoint file and using that the
download is now very fast.

Also added logging for versions of BitcoinJ and libDohJ so that we have
better control which version is used.
2018-12-06 02:22:58 +01:00
Christoph Atteneder
1e5cddd71c
Set back version to SNAPSHOT release 2018-12-03 22:41:49 +01:00
Christoph Atteneder
091430ede8
Bump version number 2018-12-03 21:51:32 +01:00
Manfred Karrer
de54518839
Set version 0.9.0 2018-12-03 00:38:44 +01:00
Manfred Karrer
0c8b00e4bd
Merge branch 'master' into release-candidate-0.9.0 2018-11-29 18:07:52 +01:00
Chris Beams
2026da0b59
Fix applicationName variable interpolation error
Prior to this fix, the build failed with the following error:

    FAILURE: Build failed with an exception.

    * Where:
    Build file '/Users/cbeams/Work/bisq-network/bisq/build.gradle' line: 109

    * What went wrong:
    Execution failed for task ':desktop:installDist'.
    > No such property: bat for class: java.lang.String
2018-11-27 10:31:44 +01:00
Florian Reimair
00f01748dd Fix broken executables in /bin dirs 2018-11-27 02:52:39 +01:00
Manfred Karrer
670345507d
Merge branch 'master' into release-candidate-0.9.0 2018-11-26 15:24:35 +01:00
Manfred Karrer
926744c962
Remove script files conflicting in copy task
@cbeams
The copy task below fails because the copied files are conflicting
with the project folder name.
I temporarily delete those files as I think they are duplicated
anyway (bisq-* are probably the one to use). Would be good if those
files don't get created in the first place.
The related *.bat files are also deleted.

I push that change directly as currently both master and release
branch fail to build.
2018-11-26 15:24:06 +01:00
Manfred Karrer
0e64a7193d
Merge branch 'master' into release-candidate-0.9.0 2018-11-25 23:52:51 +01:00
Devin Bileck
8cede5c25d
Remove *nix scripts on Windows
Related to https://github.com/bisq-network/bisq/pull/1959 which
removed .bat files on a non-Windows OS to prevent a cluttered root
directory, this change will delete *nix scripts on a Windows OS.
2018-11-25 00:35:04 -08:00
Chris Beams
46ee12dd62
Remove .bat scripts unless user OS is Windows
Previously, start scripts were generated for both *nix and Windows
platforms, resulting in an unnecessarily cluttered root directory.

With this change, both types of script are still generated, but Windows
.bat scripts are deleted immediately afterward if the user is running a
non-Windows OS (unfortunately, there was no clean way to suppress the
generation of these scripts in the Gradle StartScripts API).

See #1956
2018-11-24 10:12:23 +01:00
Chris Beams
fc0491d8da
Generate scripts for Bisq executables in root dir
This change configures the Gradle build to generate "start scripts" for
each Bisq executable (e.g. Bisq Desktop, Bisq Seednode, etc) in the root
project directory, such that after invoking `./gradle build`, the
following executable scripts become available:

    ~/Work/bisq-network/bisq
    $ ls -1 | egrep '(bisq*|lib)'
    bisq-desktop
    bisq-desktop.bat
    bisq-monitor
    bisq-monitor.bat
    bisq-relay
    bisq-relay.bat
    bisq-seednode
    bisq-seednode.bat
    bisq-statsnode
    bisq-statsnode.bat
    lib

This makes it possible for users (developers) to easily discover and use
these scripts in an idiomatic and platform-agnostic way as opposed to
the previous situation where we would advise users to run e.g.

    java -jar desktop/build/libs/desktop-0.8.0-SNAPSHOT-all.jar

This approach works, but is cumbersome and focuses unnecessarily on the
Java-based nature of the project. Now, with the changes in this commit,
the user would simply run:

    ./bisq-desktop

The 'lib' directory shown above contains all the jar files necessary to
construct classpaths for these various scripts. The 'cleanInstallDist'
task deletes the 'bisq-*' files and the 'lib' directory, and the default
'clean' task has been configured to depend on the 'cleanInstallDist'
task to ensure this cleanup happens automatically when most users would
expect it.

In the future, these same scripts can be used when installing Bisq
executables properly on users' systems via package managers like Brew
and Apt. The goal is to have the user experience around running
`bisq-desktop` (and more importantly, the forthcoming `bisqd`) be
similar in every way to installing and using `bitcoind`, `lnd` and other
idiomatic *nix-style utilities, be they Bitcoin-related or not.

See the changes in docs/build.md and docs/dev-setup.md for a further
sense of the how this change impacts the developer experience.
2018-11-23 15:00:47 +01:00
Manfred Karrer
aa05651ff4
Merge branch 'master' into release-candidate-0.9.0 2018-11-17 15:22:58 -05:00
Florian Reimair
f493b5f619 Added hashes and Netlayer release 0.6 2018-11-17 18:14:18 +01:00
Florian Reimair
68d813fc0c Refactored TorNetworkNode 2018-11-17 18:02:49 +01:00
Manfred Karrer
834ac2c04f
Merge branch 'master' into release-candidate-0.9.0 2018-11-16 21:08:03 -05:00
Manfred Karrer
f3851145f0
Merge branch 'master' into release-candidate-0.9.0 2018-11-16 20:29:56 -05:00
Florian Reimair
21a56cc127 worked around jitpack issue 2018-11-16 13:31:37 +01:00
Florian Reimair
3e25ee2cdd Use tor binaries from TorBrowser 8.0.3 2018-11-16 12:28:34 +01:00
Chris Beams
a762a6cc7c
Merge pull request #1922 from devinbileck/update-shadow-plugin
Update to latest shadow plugin version 4.0.2
2018-11-14 08:34:23 +01:00
Devin Bileck
0b794b4e92
Update to latest shadow plugin version 4.0.2
Updating to the latest shadow plugin version will resolve the following
deprecation warning:

> Task :desktop:shadowJar UP-TO-DATE
Registering invalid inputs and outputs via TaskInputs and TaskOutputs
methods has been deprecated. This is scheduled to be removed in Gradle
5.0. A problem was found with the configuration of task
':desktop:shadowJar'.

See: https://github.com/johnrengelman/shadow/issues/336
2018-11-13 22:55:21 -08:00
Manfred Karrer
12e875240d
Merge branch 'master' into release-candidate-0.9.0
# Conflicts:
#	core/src/main/java/bisq/core/payment/AccountAgeWitnessService.java
2018-11-13 14:00:54 -05:00
Florian Reimair
9e88e6eed1 Fixed netlayer and tor binary dependency issues 2018-11-13 19:51:11 +01:00
Manfred Karrer
6861e76d61
Merge branch 'master' into release-candidate-0.9.0
# Conflicts:
#	desktop/src/main/java/bisq/desktop/util/GUIUtil.java
#	desktop/src/test/java/bisq/desktop/util/GUIUtilTest.java
#	gradle/witness/gradle-witness.gradle
2018-11-08 16:55:03 -05:00
Manfred Karrer
e8ead2dfbd
Merge pull request #1893 from freimair/torrc
Torrc
2018-11-08 11:44:07 -05:00
Manfred Karrer
95ba95d822
Merge branch 'master' into release-candidate-0.9.0 2018-11-07 12:36:23 -05:00
Chris Beams
36b884e3d8
Resolve project dependencies from Maven Central vs JCenter
This change avoids the as-yet unexplained resolution errors we've been
seeing out of JCenter today, which look like the following:

    Could not resolve all files for configuration ':monitor:compileClass
    > Could not resolve net.gpedro.integrations.slack:slack-webhook:1.1.
      Required by:
          project :monitor
       > Could not resolve net.gpedro.integrations.slack:slack-webhook:1
          > Could not get resource 'http://jcenter.bintray.com/net/gpedr
             > Could not HEAD 'http://jcenter.bintray.com/net/gpedro/int
                > sun.security.validator.ValidatorException: PKIX path b

For full context, see the Travis CI build failure at
https://travis-ci.org/bisq-network/bisq/builds/451786384#L678-L679.

It is assumed this is an issue on the JCenter side, e.g. something to do
with the interaction of JCenter servers and their SSL implementation
when accessed under OpenJDK 10 and its TrustStore implementation. This
specific failure does not occur under Oracle JDK 11, but other
dependencies do fail in a similar but non-deterministic fashion. In any
case, resolving project dependencies from Maven Central solves the
problem in the meantime.

See also https://github.com/gradle/gradle/issues/6630.
2018-11-07 18:12:42 +01:00
Florian Reimair
73fc35413b bumped netlayer to 0.4.7 2018-11-07 17:13:51 +01:00
Devin Bileck
0625b1c037
Trim whitespace from version variable 2018-11-06 23:43:03 -08:00
Manfred Karrer
bb83cecd18
Add dependency for jfoenix (JavaFX UI components)
- Used for material design support
- com.jfoenix:jfoenix:9.0.6
2018-11-06 12:39:32 -05:00
Chris Beams
978fd2d4ab
Use $springVersion variable consistently
Per review feedback at
https://github.com/bisq-network/bisq/pull/1862#discussion_r230651226.
2018-11-05 11:08:21 +01:00
Chris Beams
f8ec6beedf
Remove unused $junitVersion
Per review comments at
https://github.com/bisq-network/bisq/pull/1862#discussion_r230646331.
2018-11-05 11:02:16 +01:00
Chris Beams
3913988f66
Remove unnecessary application of 'java-base' plugin
This was needed at the root level for a while when first porting the
build back to the monorepo, but is no longer necessary now.
2018-11-04 19:01:55 +01:00
Chris Beams
743a7692b7
Remove unnecessary seednode resources config
This looks to have been a copy and paste error when originally setting
up the seednode build.
2018-11-04 19:00:44 +01:00
Chris Beams
adb3e9e3c6
Remove unnecessary :desktop:test javaagent config 2018-11-04 19:00:04 +01:00
Chris Beams
22b92f7057
Use two blank lines between configure blocks
To increase readability
2018-11-04 18:43:20 +01:00
Chris Beams
5cdacbe336
Extract variables for duplicate dependency versions 2018-11-04 18:41:56 +01:00
Chris Beams
cb4f6edd9a
Minimize common subproject javafx dependencies 2018-11-04 18:16:07 +01:00
Chris Beams
3cd467cc9f
Pull up remaining statsnode config to root 2018-11-04 18:00:56 +01:00
Chris Beams
b0886dd02d
Pull up remaining seednode config to root 2018-11-04 18:00:10 +01:00
Chris Beams
9c82b3076a
Pull up remaining relay config to root 2018-11-04 17:58:37 +01:00
Chris Beams
15b81df32f
Pull up remaining pricenode config to root 2018-11-04 17:57:28 +01:00
Chris Beams
2f7c5f1150
Pull up remaining p2p config to root 2018-11-04 17:46:03 +01:00
Chris Beams
e97625cfc3
Pull up remaining monitor config to root 2018-11-04 17:41:37 +01:00
Chris Beams
3c54be2d4f
Pull up remaining desktop config to root
And also relocate gradle-witness jar and config (back) to root-level
gradle/witness dir.
2018-11-04 17:37:32 +01:00
Chris Beams
0f5e9b794c
Pull up remaining core config to root 2018-11-04 17:18:46 +01:00
Chris Beams
d4edb81d87
Pull up remaining common config to root 2018-11-04 16:55:33 +01:00
Chris Beams
c8956567e4
Pull up remaining assets config to root 2018-11-04 16:45:00 +01:00
Chris Beams
bd1e7e273f
Pull up application plugin config to root 2018-11-04 16:27:52 +01:00
Chris Beams
1cdb39ab60
Pull up JesusMcCloud repo to root
Not all subprojects need it, but most do.
2018-11-04 14:28:14 +01:00
Chris Beams
f6a68f8aef
Pull up common JavaCompile config to root 2018-11-04 14:20:55 +01:00
Chris Beams
4e1fa914a2
Pull up common repositories to root build.gradle 2018-11-04 14:20:55 +01:00
Chris Beams
95c8b8ddfa
Pull up application and configuration of java plugin 2018-11-04 14:20:55 +01:00
Chi Nul
14efcbce98
Merge "Update root gradle scripts":9c628bb873cbfd7fd9c56fbbd022470a205561f9 from @chirhonul 2018-09-05 11:15:30 +02:00
Christoph Atteneder
c1c38a3ceb
Move desktop to subdirectory 2018-09-05 09:50:29 +02:00
Christoph Atteneder
eebcde814c
Use correct version number 2018-08-23 13:08:19 +02:00
Christoph Atteneder
ed3e90c2d4
Revert version to -SNAPSHOT 2018-08-22 13:22:29 +02:00
Christoph Atteneder
c866f9d903
Update version number for release 2018-08-22 13:06:28 +02:00
Manfred Karrer
05c3db3f58
Add dependencyVerification items
- There are still issues with libdohj and btcj. If the gradle task is
run it fails because it cannot resolve core....
2018-08-21 23:26:44 +02:00
Manfred Karrer
9a9d574521
Update libdohj to 5047c80004, remove temp dependencyVerification items
- remove temp dependencyVerification items to not break other builds
as dependencies have changed but they are still not correctly
resolved ;-(
2018-08-21 20:33:30 +02:00
Manfred Karrer
7cdda97155
Merge branch 'master' into merged-voting 2018-08-15 16:27:09 +02:00
Manfred Karrer
814ade4f1c
Merged 2018-08-15 16:24:41 +02:00
Manfred Karrer
6499772580
Fix version number 2018-08-15 15:30:05 +02:00
Manfred Karrer
76cc2c8b05
Merge branch 'master' into voting
# Conflicts:
#	src/main/resources/i18n/displayStrings.properties

Merge branch 'master' into voting

# Conflicts:
#	build.gradle
2018-08-15 00:14:22 +02:00
Manfred Karrer
24991d739a
Change version from -SNAPSHOT to 0.9.0 2018-08-09 14:15:00 +02:00
Manfred Karrer
7bd22d1886
Remove grpc from build 2018-08-06 12:22:52 +02:00
Manfred Karrer
4a0c8b6dc1
Prepare for custom binary:
- Set version 0.8.0
- Use Bisq_notifications as app name
- Improve Relay
- Fix build issues
2018-08-06 02:11:58 +02:00
Manfred Karrer
dbad3950ae
Merge branch 'master' into notifications 2018-08-06 00:56:46 +02:00
Manfred Karrer
d2eae6b99e
Change order of dependencies
Just to retrigger a travis build as for some strange reasons core does not get resolved.
2018-07-26 18:14:31 +02:00
Manfred Karrer
4ec69f082e
Merge branch 'master' into voting
# Conflicts:
#	build.gradle
#	src/main/java/bisq/core/CoreModule.java
#	src/main/java/bisq/core/dao/DaoModule.java
#	src/main/java/bisq/core/dao/DaoSetup.java
#	src/main/java/bisq/core/dao/vote/blindvote/BlindVoteService.java
#	src/main/java/bisq/core/dao/vote/proposal/ProposalService.java
#	src/main/java/bisq/core/dao/vote/votereveal/VoteRevealService.java
#	src/main/java/bisq/core/proto/persistable/CorePersistenceProtoResolver.java
#	src/main/java/bisq/core/trade/statistics/TradeStatistics2Store.java
#	src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java
#	src/main/resources/i18n/displayStrings_de.properties
#	src/main/resources/i18n/displayStrings_el.properties
#	src/main/resources/i18n/displayStrings_es.properties
#	src/main/resources/i18n/displayStrings_hu.properties
#	src/main/resources/i18n/displayStrings_pt.properties
#	src/main/resources/i18n/displayStrings_ro.properties
#	src/main/resources/i18n/displayStrings_ru.properties
#	src/main/resources/i18n/displayStrings_sr.properties
#	src/main/resources/i18n/displayStrings_zh.properties

Merge branch 'master' into voting

# Conflicts:
#	src/main/java/bisq/common/UserThread.java
#	src/main/proto/pb.proto

Merge branch 'master' into voting

# Conflicts:
#	src/main/java/bisq/desktop/app/BisqAppMain.java
#	src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java
2018-07-11 02:43:32 +02:00
Manfred Karrer
a0b05c0741
Add mobile notification view 2018-07-11 00:08:42 +02:00
Christoph Atteneder
2b85d84bde
Revert version to -SNAPSHOT 2018-07-04 13:46:35 +02:00
Christoph Atteneder
e465428b4b
Use version 0.7.1 instead of -SNAPSHOT and bump version number where required 2018-07-04 13:44:44 +02:00
Manfred Karrer
15ad8f8f40
Update gradle files
- Move mavenLocal on top to resolve local jars first
- Comment out annotationProcessor and testAnnotationProcessor entries as
 they conflict with grpc build (don't know why). Complete project build
 works also without the annotationProcessor entries.
- Comment out btcd-cli4j entries in dependencyVerification as they cause
build failure. TODO investigate why...
2018-06-29 11:59:40 +02:00
Manfred Karrer
3eb187acff
Remove http-api 2018-06-28 19:59:57 +02:00
Manfred Karrer
a21fed6b52
Merge branch 'api-integration' into voting
# Conflicts:
#	src/main/java/bisq/core/arbitration/DisputeManager.java

Merge branch 'api-integration' into voting

# Conflicts:
#	build.gradle
#	src/main/java/bisq/desktop/main/dao/BaseProposalView.java
#	src/main/java/bisq/desktop/main/dao/proposal/ProposalListItem.java
#	src/main/java/bisq/desktop/main/dao/proposal/active/ActiveProposalsView.java
#	src/main/java/bisq/desktop/main/dao/proposal/closed/ClosedProposalsView.java
#	src/main/java/bisq/desktop/main/dao/proposal/make/MakeProposalView.java
#	src/main/java/bisq/desktop/main/dao/proposal/myvotes/MyVotesView.java
#	src/main/java/bisq/desktop/util/GUIUtil.java
2018-06-16 14:48:20 +02:00
Manfred Karrer
ba011d4629
Merge branch 'api-integration' into voting
# Conflicts:
#	src/main/java/bisq/core/arbitration/DisputeManager.java

Merge branch 'api-integration' into voting

# Conflicts:
#	build.gradle
#	src/main/java/bisq/desktop/main/dao/BaseProposalView.java
#	src/main/java/bisq/desktop/main/dao/proposal/ProposalListItem.java
#	src/main/java/bisq/desktop/main/dao/proposal/active/ActiveProposalsView.java
#	src/main/java/bisq/desktop/main/dao/proposal/closed/ClosedProposalsView.java
#	src/main/java/bisq/desktop/main/dao/proposal/make/MakeProposalView.java
#	src/main/java/bisq/desktop/main/dao/proposal/myvotes/MyVotesView.java
#	src/main/java/bisq/desktop/util/GUIUtil.java
2018-06-16 14:22:51 +02:00
Manfred Karrer
9c3865a331
Use verbosity in getBlock rpc call to get all txs
Update to btcd-cli4j cb5c474b
2018-06-16 13:39:27 +02:00
Manfred Karrer
ac17955dbe
Add mavenLocal to repositories 2018-06-16 13:15:58 +02:00
Manfred Karrer
15baead905
Add mavenLocal, updatte hashes 2018-06-08 13:42:58 +02:00
Manfred Karrer
bf46320cbc
Merge branch 'refactoring-mainviewmodel' into api-integration
# Conflicts:
#	build.gradle
#	src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java
2018-06-06 15:10:54 +02:00
Chris Beams
6467b557da
Update instructions for regenerating dependency verification hashes 2018-06-05 16:50:05 +02:00
Chris Beams
ba1419a515
Update libdohj and bitcoinj dependency verification hashes
This does the work that was intended to be done in commit
175e11d81c, but was done by first removing
the dependencyVerification block entirely, and then replacing it with
the output of the `calculateChecksums` task.

The entire process went like this:

 1. Remove existing dependencyVerification block from build.gradle
 2. Run `./gradlew -q calculateChecksums | grep -v network.bisq:bisq- >> build.gradle`
 3. Run `git diff` to see that only the checksums we expect to have
    changed have in fact changed (libdohj and bitcoinj in this case).
 4. Commit the changes (in this commit)

I'll update the instructions for the dependencyVerification block in a
subsequent commit to make this clearer in the future.
2018-06-05 16:40:31 +02:00
Chris Beams
536d13fbff
Revert "Update build.gradle to fix failing checksum tests"
This reverts commit 175e11d81c.
2018-06-05 16:39:02 +02:00
Manfred Karrer
175e11d81c
Update build.gradle to fix failing checksum tests
The calculated checksum from the calculateChecksums task did not
reflect updates of libdohj and bitcoinj.
libdohj is a dependency in common but seems the calculateChecksums task
in desktop did not resolve that correctly. It did not change the
checksum after the libdohj version has changed and led to build errors.
Adding the libdohj dependency in Desktop as well solves the issue.
@bceams: If there is a better solution to solve that feel free to
revert and apply....
2018-06-05 11:52:41 +02:00
Manfred Karrer
3602d4eb0f
Add dependencies of http-api 2018-05-31 02:28:53 +02:00
Manfred Karrer
8ddcd937c2
Add support for BisqHttpApi to DesktopMain
- Add option keys desktopWithHttpApi and desktopWithGrpcApi
- Add BisqDaemon to BisqApp
- Fix wrong package of BisqGrpcClient and BisqGrpcServer
- Add BisqHttpApi stub
- Add http-api and bisq-grpc to Desktop
2018-05-31 01:13:05 +02:00
Manfred Karrer
30ab8c86cf
Merge pull request #1556 from ManfredKarrer/mk_master
Fix reuse of change addresses
2018-05-28 13:14:58 +02:00
Manfred Karrer
e7bdfecca1
Update hashes of libdohj, bitcoinj-core and commons-codec 2018-05-27 13:36:27 +02:00
Manfred Karrer
aa7c9564f2
Update build file
- Remove BC inclusion (not working that way)
- Add support for reproducible builds
2018-05-25 15:16:22 +02:00
Manfred Karrer
323d058025
Revert version to -SNAPSHOT 2018-05-11 20:23:53 +02:00
Manfred Karrer
bd690d3878
Add BC jars 2018-05-11 18:16:05 +02:00
Manfred Karrer
7941e55c91
Change version from -SNAPSHOT to 0.7.0 2018-05-11 10:54:44 +02:00
Manfred Karrer
a66a663f48
Revert version to -SNAPSHOT 2018-05-11 10:16:03 +02:00
Manfred Karrer
6e8d4dfd3f
Add mavenLocal to repositories in gradle file 2018-05-10 23:13:40 +02:00
Manfred Karrer
190aca584a
Use version 0.7.0 instead of -SNAPSHOT 2018-05-10 12:27:41 +02:00
Chris Beams
4a7801023d
Re-introduce fat executable jar for release packaging
Prior to this fix, running `./package/osx/create_app.sh` produced a
"Main application jar is missing." error. Now the script works as
expected.
2018-05-06 15:40:00 +02:00
Chris Beams
5613629bbe
Remove distZip.enabled statement from build.gradle
Setting this value to `false` was a minor optimization to improve build
speed, as we don't need both tar and zip dists to be built (and zip
actually takes a few seconds).

PR #1500 set it to `true`, because it ended up causing build failures
down the road. This commit removes the statement altogether, as `true`
is the default value anyway.
2018-04-13 10:20:29 +02:00
Bernard Labno
d2ba3b8c95 Enable distZip flag in "build.gradle". 2018-04-06 11:20:50 +02:00
Chris Beams
86947c976c
Revert to 4-space indentation in build.gradle
Recent changes to dependencyVerification got committed with 8-space
indentation, causing a diff for the whole block. This reverts it to
4-space, which is what is generated by `gradle -q calculateChecksums`.
2018-03-29 19:44:35 +02:00
Manfred Karrer
11446d27f4
Add checksum for org.bouncycastle:bcpg-jdk15on 2018-03-29 12:36:08 -05:00