Commit Graph

412 Commits

Author SHA1 Message Date
Chris Beams
de35c1ba0c
Merge branch 'native'
This merges the work to generate native installers for Windows, Linux
and OS X using the JavaFX Gradle plugin. See #66 for details.
2014-10-03 18:37:55 +02:00
Chris Beams
153eb5326b
Work around outdated OracleJDK8 on Travis CI server
The Gradle JavaFX plugin requires Oracle JDK 8u20 or better. Travis CI
currently runs something older, and does not have a roadmap for
upgrading. This commit instructs the Travis CI VM to install JDK 8u20
via `apt` prior to actually beginning the build.

See #66
2014-10-03 18:35:58 +02:00
Raúl Álvarez González
bfa585583f
Add icons based on Apple design guidelines
These icons have been added to the src/deploy/package directory, which
is used by the JavaFX Gradle plugin when building native installers.
Icons are designed primarily for clean integration on OS X systems.
Linux and Windows variants can be added at a later time.

The src/deploy/package/shortcut.sketch directory contains sources used
to design the icons.

See #66, #67
Closes #103
2014-10-03 18:35:53 +02:00
Chris Beams
e1889b0697
Update JavaFX Gradle plugin repository config
This commit makes the following improvements upon the stock
javafx.gradle file introduced in the previous commit:

 - Swap Maven Central for JCenter
 - Remove mavenLocal entirely
 - Update naming for clarity

See #66
2014-10-03 18:35:18 +02:00
Chris Beams
d16c2740b6
Generate native installers with Gradle JavaFX plugin
The plugin's jfx* tasks tie into the normal Gradle build lifecycle, such
that `gradle build` will now generate executables and installers
according to the OS on which the build is being run. These files are
output to the `build/distributions` directory.

Installers work as expected OS X and Linux at this point.

Windows installers do build, but a very particular configuration is
necessary on the Windows machine doing the building (this configuration
is to be documented in #109). However, even when the configuration is in
place and the MSI installer is successfully built, there is still a
fatal error at installer execution time relating to a missing
msvp100.dll file. See details at
https://bitbucket.org/shemnon/javafx-gradle/issue/43. An issue has been
created to track this from the Bitsquare side as well--see #108.

The changes made in this commit are based on on the samples at
http://bitbucket.org/shemnon/javafx-gradle and the article at
http://jaxenter.com/tutorial-a-guide-to-the-gradle-javafx-plugin-46270.html

The gradle/javafx.gradle file is copied directly from the sources in the
bitbucket repository above, as is apparently the convention (not sure
why this isn't part of the plugin itself, but that's a question to be
addressed later).

Resolves #66, #100
See #108, #109
2014-10-03 18:32:03 +02:00
Chris Beams
bfd12b4648
Document building from source
Resolves #105
2014-10-03 18:13:15 +02:00
Chris Beams
bdcfabff28
Refine README
See #95
2014-10-03 18:13:15 +02:00
Chris Beams
1031a72e52
Upgrade to BitcoinJ 0.12 GA
Resolves #98
2014-10-03 18:13:14 +02:00
Chris Beams
9727ea21a8
Upgrade to BitcoinJ 0.12-SNAPSHOT
- Update imports to reflect BitcoinJ's repackaging, including:

   git grep -l 'import com.google.bitcoin' | \
   xargs perl -p -i -e 's/import com.google.bitcoin/import org.bitcoinj/'

   git grep -l 'com.google.bitcoin' | \
   xargs perl -p -i -e 's/com.google.bitcoin/org.bitcoinj/'

 - Replace use of BitcoinJ's CoinFormat, which has now been renamed to
   MonetaryFormat, using:

   git grep -l 'CoinFormat' | \
   xargs perl -p -i -e 's/CoinFormat/MonetaryFormat/g'

 - Fix calls to BitcoinJ's Script#correctlySpends, whose signature has
   changed from 0.11 => 0.12.

See #98
2014-10-03 18:13:14 +02:00
Chris Beams
154641eb40
Merge branch 'docs' 2014-10-03 17:05:55 +02:00
Chris Beams
9c976f1931
Document building from source
Resolves #105
2014-10-03 17:00:50 +02:00
Chris Beams
17cddd0cfc
Refine README
See #95
2014-10-03 17:00:50 +02:00
Chris Beams
18c944da50
Merge pull request #104 from bitcoinj-0.12 2014-10-03 13:59:25 +02:00
Chris Beams
aab3154275
Upgrade to BitcoinJ 0.12 GA
Resolves #98
2014-10-03 09:51:55 +02:00
Chris Beams
6db403b93f
Update and simplify README
Resolves #95
2014-10-02 19:00:21 +02:00
Chris Beams
041d8ec7a7
Upgrade to BitcoinJ 0.12-SNAPSHOT
- Update imports to reflect BitcoinJ's repackaging, including:

   git grep -l 'import com.google.bitcoin' | \
   xargs perl -p -i -e 's/import com.google.bitcoin/import org.bitcoinj/'

   git grep -l 'com.google.bitcoin' | \
   xargs perl -p -i -e 's/com.google.bitcoin/org.bitcoinj/'

 - Replace use of BitcoinJ's CoinFormat, which has now been renamed to
   MonetaryFormat, using:

   git grep -l 'CoinFormat' | \
   xargs perl -p -i -e 's/CoinFormat/MonetaryFormat/g'

 - Fix calls to BitcoinJ's Script#correctlySpends, whose signature has
   changed from 0.11 => 0.12.

See #98
2014-10-02 16:07:27 +02:00
Manfred Karrer
0ef491ac58 Fix bug with collateral 2014-10-02 15:24:35 +02:00
Manfred Karrer
d20a9306ee Add icons 2014-10-02 14:45:04 +02:00
Manfred Karrer
b9b7d4b3e0 Improve usability, fix bugs 2014-10-02 14:30:05 +02:00
Manfred Karrer
a334beb1a7 Update controlsfx to be compatible with latest jdk 2014-09-30 23:36:00 +02:00
Manfred Karrer
3a17d5062b Add linux java8 install commands 2014-09-30 21:43:27 +02:00
Manfred Karrer
1745a27d5f Fix withdrawal list update problems and payout amount 2014-09-30 21:38:23 +02:00
Manfred Karrer
3c05af90f2 Improve UI 2014-09-30 15:49:01 +02:00
Chris Beams
c5028c178c
Finish upgrading Gradle wrapper from 2.0 => 2.1
Commit 4d4787d updated the Gradle wrapper config from 2.0 => 2.1, but
did not actually update the wrapper properties file (forgot to run
`gradle wrapper`). This commit finishes what was started there.
2014-09-29 14:23:08 +02:00
Manfred Karrer
8d5488b633 Link help to dummy help page 2014-09-29 13:07:35 +02:00
Manfred Karrer
0b808e529b Update tagline 2014-09-29 12:09:47 +02:00
Manfred Karrer
9d0dbb587e Merge remote-tracking branch 'origin/master' 2014-09-29 12:04:51 +02:00
Manfred Karrer
d03d1cf760 Add under construction messages, deactivate not implemented features, update logo 2014-09-29 12:04:33 +02:00
Chris Beams
a30409ebaf
Update IRC channel from #bitsquare.io => #bitsquare 2014-09-29 11:22:07 +02:00
Manfred Karrer
94f4b2aeb0 Change logo 2014-09-29 10:47:17 +02:00
Chris Beams
2a4f6bc5ea
Update Travis IRC notifications
- Send notifications to #bitsquare instead of #bitsquare.io
 - Skip join to cut down on noise (now that -n flag has been removed)
 - Only notify on failures and first success

See #86
2014-09-29 10:38:07 +02:00
Chris Beams
5799381658
Fix typo in Travis IRC notification template
See #86
2014-09-29 10:05:04 +02:00
Chris Beams
4d4787d84a
Upgrade Gradle wrapper version from 2.0 => 2.1 2014-09-29 09:56:30 +02:00
Chris Beams
a4a433fa64
Set skip_join to false in Travis IRC config
Per http://docs.travis-ci.com/user/notifications/#IRC-notification.

Bypassing joining the room cuts down on login/logout noise in the IRC
channel. But because #bitsquare.io currently has the -n flag set we
need to explicitly log in.

See #86
2014-09-29 09:53:17 +02:00
Chris Beams
fa6d916296
Publish CI build notifications to IRC
See #86
2014-09-29 09:43:05 +02:00
Chris Beams
2e9a07a6c5
Add Travis CI build status badge to README
See #86
2014-09-29 09:35:10 +02:00
Chris Beams
c744fa21df
Enable Travis CI build
Per instructions at http://docs.travis-ci.com/user/getting-started.
See https://travis-ci.org/bitsquare/bitsquare

Resolves #86
2014-09-29 09:28:11 +02:00
Chris Beams
d536258871
Use published snapshots for BitcoinJ and TomP2P
Bitsquare depends on specific versions of BitcoinJ and TomP2P that have
not previously been published to any maven repository--until now. Based
on the 'published' branch of the bitcoinj [1] and tomp2p [2] forks under
the bitsquare organization, snapshots have been published to a temporary
repository [3] that has been made available to us by JFrog.

To be as explicit as possible, these custom-published snapshots have
had their version numbers qualified with the short hash of the commit
they were built from. So for bitcoinj, the dependency is no longer
0.12-SNAPSHOT, but 0.12.308de4e-SNAPSHOT. For TomP2P, the version has
gone from 5.0-Alpha24-SNAPSHOT to 5.0-Alpha24.805623c-SNAPSHOT.
Accordingly, these qualified versions are now reflected in the
dependency declarations in build.gradle.

This means that it is no longer necessary to build bitcoinj and tomp2p
locally in order to get up and running with Bitsquare development, and
the README has been updated accordingly. And it also means we can now
set up a Travis CI build with ease (which shall be done with #86).

Resolves #97

[1]: https://github.com/bitsquare/bitcoinj/tree/published
[2]: https://github.com/bitsquare/tomp2p/tree/published
[3]: http://partnerdemo.artifactoryonline.com/partnerdemo/libs-snapshots-local/
2014-09-29 08:49:23 +02:00
Manfred Karrer
ba3d04fed1 Add config file support for seednode selection, Fix resource loading bug with checkpoint file for mainnet 2014-09-29 03:01:01 +02:00
Manfred Karrer
a5a04fe72c Add config file support for network type selection 2014-09-29 01:44:50 +02:00
Manfred Karrer
d2b1c5f37c Add window icon, change texts, remove balance display 2014-09-28 03:31:27 +02:00
Manfred Karrer
4b117b2e84 Remove useless test 2014-09-27 01:44:32 +02:00
Manfred Karrer
14b452efc3 Fine tune trade process 2014-09-27 01:39:55 +02:00
Manfred Karrer
026a3e4b93 Remove deprecated method from Formatter 2014-09-26 14:23:35 +02:00
Manfred Karrer
87d89f2dc6 Move arbitration screens to new account tab 2014-09-26 14:20:04 +02:00
Manfred Karrer
9ea6fb9b55 Remove old Controller classes 2014-09-26 11:42:12 +02:00
Manfred Karrer
33148a9a8a Clean up orders package 2014-09-26 11:18:11 +02:00
Manfred Karrer
1130da6a8f Remove static methods from BSFormatter 2014-09-26 10:36:51 +02:00
Manfred Karrer
19e71ffad2 Remove BitSquareValidator (was deprecated) 2014-09-26 10:04:07 +02:00
Manfred Karrer
a7e6fd96c7 Remove TomP2P dependency in ArbitratorBrowser 2014-09-26 09:57:17 +02:00