Commit Graph

389 Commits

Author SHA1 Message Date
battleofwizards
2d4abbe143
Remove controlsfx dependency
The controlsfx is a huge JavaFX components library (0.83MB as JAR).

Turns out, we only use a single component, the PopOver. Fortunately,
the PopOver is self-contained and easy to pull out from controlsfx.

This commit embeds the PopOver in the project and removes controlsfx
dependency. The embedded version is exactly the same as previously
used in the project, so no change in semantics should occur.
2019-09-18 11:52:50 +02:00
battleofwizards
9ea6b2163e
Remove reactfx dependency
The reactfx was a 0.33MB dependency / 238 Java source files.

We only used it for FxTimer helper and to measure FPS in development mode.

The small FxTimer class got copied over into the project,
so there is no change in semantics.

The FPS measurement got replaced w/ com.sun.javafx.perf.PerformanceTracker,
an internal but long stable part of JavaFx. This is probably not a problem,
because it only concerns a rarely used, developer feature.
2019-09-18 09:34:46 +02:00
Christoph Atteneder
cc3128d4e0
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.1.6
# Conflicts:
#	core/src/main/java/bisq/core/offer/OfferUtil.java
#	core/src/main/resources/i18n/displayStrings.properties
#	desktop/src/main/java/bisq/desktop/main/MainView.java
#	desktop/src/main/java/bisq/desktop/main/MainViewModel.java
#	desktop/src/main/java/bisq/desktop/main/market/trades/TradesChartsViewModel.java
#	desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java
#	desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java
#	desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersViewModel.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesView.java
#	desktop/src/main/java/bisq/desktop/main/support/dispute/DisputeView.java
#	desktop/src/main/java/bisq/desktop/main/support/dispute/agent/DisputeAgentView.java
2019-09-17 15:52:51 +02:00
Christoph Atteneder
c0563fba1b
Revert to SNAPSHOT version 2019-09-16 11:21:39 +02:00
Christoph Atteneder
457da44b0c
Bump version number 2019-09-13 19:20:26 +02:00
Florian Reimair
ff45007c38
Update to Tor v0.4.1.5 2019-09-05 12:52:12 +02:00
Christoph Atteneder
2c9e927150
Merge pull request #3195 from battleofwizards/remove-bcprov-as-direct-dependency
Remove bcprov from direct dependencies - a major step towards eventually removing Bouncy Castle
2019-09-04 10:18:55 +02:00
battleofwizards
d27311f0a8
Remove json-simple dependency
Turns out it was only used in a dead code.
2019-09-03 16:53:41 +02:00
battleofwizards
1c580da5ed
Remove bouncycastle:bcprov from *direct* dependencies
We still depend on this jar *indirectly* via bouncycastle:bcpg,
which is used for PGP signature verification of Bisq Desktop updates.

This gets us closer to prospect of removing Bounce Castle dependency
entirely in the future.

Rationale for this direction:

* We are really only using Bouncy Castle for PGP sig verification
* Java's builtin cryptography got vastly better since 2000
* We should prefer boring and proven cryptography anyway
* Australian projects should be considered compromised,
  and Bouncy Castle is run by Australian non-profit organization
* Bouncy Castle is a heavy dependency totaling 3.6MB
2019-09-03 15:07:22 +02:00
sqrrm
ab96f2a735
Use latest btcd-cli4j 2019-09-02 15:59:55 +02:00
Bernard Labno
2362c0f387
Remove Byteball in order to remove commons-codec.
This asset is not traded anymore.
2019-09-01 12:14:15 +02:00
battleofwizards
37ee034b96
Do not specify indirect module dependencies
One is supposed to only specify direct dependencies in build.gradle.
This commit removes two superfluous deps statements for the desktop
module. Other modules already follow the convention.

This does *not* remove any dependencies - it only cleans up how they
are specified.
2019-08-30 11:54:46 +02:00
Christoph Sturm
9b046be39d put version variables in alphabetical order. 2019-08-21 08:35:58 +02:00
Christoph Sturm
26c053dae8 Apply kotlin plugin and convert one unused class to kotlin
just to check that everything works and to show how much simpler
kotlin code looks.
2019-08-20 16:07:07 +02:00
sqrrm
74fc76db87
Merge pull request #3097 from battleofwizards/bump-protobuf-to-fix-warning
Update protobuf to fix annoying warnings
2019-08-16 18:17:08 +02:00
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