Commit Graph

8950 Commits

Author SHA1 Message Date
Manfred Karrer
fb89f087f0 fixed app dir problem with update to gradle. 2014-08-28 18:24:42 +02:00
Chris Beams
fb7397eb48
Merge branch 'gradle' 2014-08-28 14:36:10 +02:00
Chris Beams
7c176be3a0
Remove Maven pom 2014-08-28 13:56:06 +02:00
Chris Beams
bf7e46d1d5
Add Gradle OneJar plugin
For creation of a self-contained executable jar.

Run:
 - `./gradle executableJar`
 - `java -jar ./build/libs/bitsquare.jar

Note that actually executing the jar fails with an exception from
io.bitsquare.util.AppDirectoryUtil.createDirIfNotExists. This will be
fixed later. The purpose of this commit is only to establish the
executable jar infrastructure.
2014-08-28 13:56:06 +02:00
Chris Beams
0501965b99
Configure Gradle application plugin
- `./gradlew run` to launch Bitsquare
 - `./gradlew installApp` to create scripts in build/install/bitsquare

See http://www.gradle.org/docs/current/userguide/userguide_single.html#application_plugin
2014-08-28 13:56:05 +02:00
Chris Beams
62cb43dce5
Configure Gradle build
- Set version at 0.1.0-SNAPSHOT, per http://semver.org practices
 - Configure dependencies per existing Maven pom
 - Resolve dependencies from jcenter by default, mavenLocal for custom
   BitcoinJ and TomP2P binaries (which still must be built separately)
 - Copy non-java files (fxml, etc) from src/main/java when processing
   resources

`./gradle build` is now completes successfully.
2014-08-28 13:56:05 +02:00
Chris Beams
4cfc949446
Generate Gradle wrapper artifacts
See http://www.gradle.org/docs/current/userguide/gradle_wrapper.html
2014-08-28 13:56:04 +02:00
Chris Beams
49adf9cc97
Add Gradle build file with wrapper configuration 2014-08-28 13:56:04 +02:00
Manfred Karrer
a8c3040fb3 updates with formatting 2014-08-28 12:53:27 +02:00
Manfred Karrer
56ca79a58f fix bug with formatting 2014-08-27 21:41:18 +02:00
Manfred Karrer
ab6ae89c38 reformatting 2014-08-27 21:26:40 +02:00
Manfred Karrer
7fee8b665e add input validators 2014-08-27 21:25:49 +02:00
Manfred Karrer
223b32e603 update readme 2014-08-27 14:50:24 +02:00
Manfred Karrer
fade2bc28f update logo 2014-08-27 14:49:32 +02:00
Manfred Karrer
5449e9d31c update logo and sys tray icon 2014-08-27 14:35:51 +02:00
Manfred Karrer
d9c6c8dd90 update twitter link 2014-08-27 14:09:34 +02:00
Manfred Karrer
4844cdd3c4 add more contact links 2014-08-27 13:14:30 +02:00
Manfred Karrer
8e22e42556 update MVP for create offer, improve addressTF, balanceTF, create inputvalidator 2014-08-27 01:29:34 +02:00
Manfred Karrer
e8761467ca small bugfixes 2014-08-26 22:03:15 +02:00
Manfred Karrer
919cde4e43 removed unused code, comments, small refactorings 2014-08-26 21:52:04 +02:00
Manfred Karrer
d3d23cc459 refactor packages and rename protocol class for trade process, comments 2014-08-26 21:05:40 +02:00
Manfred Karrer
c455ae176b Merge remote-tracking branch 'origin/master' 2014-08-26 18:31:45 +02:00
Manfred Karrer
fd62cbe9ef removed most SuppressWarning annotations, added comments 2014-08-26 18:31:35 +02:00
Chris Beams
ec6b0ae6bc
Ignore OS X .DS_Store files 2014-08-26 18:28:21 +02:00
Manfred Karrer
627b49c7c1 fixed locale problem with fiat comparison in tests, added comments 2014-08-26 18:19:24 +02:00
Manfred Karrer
5415878356 changed fiat comparison in tests, added comments 2014-08-26 17:58:37 +02:00
Manfred Karrer
77431b3d94 added comments 2014-08-26 17:44:55 +02:00
Chris Beams
1955250ae8
Apply formatting to strip trailing whitespace 2014-08-26 17:36:59 +02:00
Manfred Karrer
98c6e34b23 fixed utest, update formatting added comments 2014-08-26 17:32:43 +02:00
Manfred Karrer
25b2afc545 merged with cbeams formatting changes. use MVP pattern for create offer screen (2. update) 2014-08-26 17:05:45 +02:00
Manfred Karrer
a9794a79d2 Merge remote-tracking branch 'origin/master'
Conflicts:
	src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferController.java
	src/main/java/io/bitsquare/gui/util/BSFormatter.java
2014-08-26 16:58:34 +02:00
Manfred Karrer
1c3c8b9d21 merged with cbeams formatting changes. use MVP pattern for create offer screen 2014-08-26 16:57:31 +02:00
Chris Beams
bf6652c340
Add trailing newline 2014-08-26 16:31:35 +02:00
Chris Beams
e4be536b63
Polish Javadoc 2014-08-26 16:31:21 +02:00
Chris Beams
75299b4311
Remove Bitsquare GPL copyright from Oracle sources
Certain sources are already copyrighted by Oracle. This commit partially
reverts be3beb5 by deleting the copyright headers that were added there.
All Oracle copyright headers remain intact.
2014-08-26 16:29:35 +02:00
Chris Beams
3fcc56f849
Collapse TODO comments onto single line 2014-08-26 16:28:58 +02:00
Chris Beams
fcd9966978
Remove code that has been commented out 2014-08-26 16:26:16 +02:00
Chris Beams
7f67d5545d
Merge branch 'formatting' 2014-08-26 16:06:00 +02:00
Chris Beams
a31aa9c883
Organize import statements 2014-08-26 16:01:34 +02:00
Chris Beams
424d4e8ff8
Format else statements on new line
Based on Manfred's existing IDEA settings
2014-08-26 16:01:33 +02:00
Chris Beams
a3c4df8dc3
Adjust line wrapping by hand 2014-08-26 16:01:33 +02:00
Chris Beams
1ad1d318e8
Wrap lines at 120 chars 2014-08-26 16:01:33 +02:00
Chris Beams
23b2cabf19
Apply formatting to XML sources 2014-08-26 16:01:32 +02:00
Chris Beams
7d6ca37d06
Apply formatting to Java sources
This is essentially the default IDEA formatting settings, with one tweak
made to allow same-line field annotations (useful particularly in the
case of the @FXML annotation)
2014-08-26 16:01:32 +02:00
Chris Beams
9c3df7375a
Add IDEA formatting settings 2014-08-26 16:01:31 +02:00
Chris Beams
681f2d55b8
Convert sources to unix line endings
Performed with the following command:

    $ git ls-files | xargs dos2unix
2014-08-26 16:01:26 +02:00
Chris Beams
26b8bb09be
Apply copyright to FXML sources
Per http://www.gnu.org/licenses/gpl-howto.html
2014-08-26 15:56:15 +02:00
Chris Beams
be3beb5c13
Apply copyright to Java sources
Per http://www.gnu.org/licenses/gpl-howto.html
2014-08-26 15:56:14 +02:00
Chris Beams
d5e7b6cfdb
Add IDEA copyright configuration 2014-08-26 15:56:14 +02:00
Chris Beams
6ff63ce2c6
Ignore Vim swap files 2014-08-26 15:56:13 +02:00