Commit graph

292 commits

Author SHA1 Message Date
Christoph Atteneder
4201e065bc
Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.1.6
# 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-09-23 10:57:03 +02:00
Christoph Atteneder
4842352756
Revert to SNAPSHOT version 2019-09-23 10:55:08 +02:00
Christoph Atteneder
58f3f73d56
Bump version number 2019-09-23 10:10:09 +02:00
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