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
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
Manfred Karrer
a05ab5ae17
Update checksum hashes of dependencies
2018-03-29 12:34:39 -05:00
Christoph Atteneder
626cf5fb1b
Remove unused library
2018-03-26 14:08:38 +02:00
