Commit Graph

1282 Commits

Author SHA1 Message Date
Adrian Tiberius 003b2650dd Some lint fixes. 2015-06-04 16:30:55 +02:00
Adrian Tiberius c695ce4772 ethereumj-core cleaning (bring it closer to develop branch for merging). 2015-06-03 18:24:25 +02:00
Adrian Tiberius 99fed23489 Removed dagger plugin.
Updated dagger to 2.1-SNAPSHOT.
2015-06-03 17:14:12 +02:00
Adrian Tiberius 01ad7b12e8 Fix last unit test error.
Fix dagger2 gradle for java app.
Deleted extra files.
2015-06-03 16:23:01 +02:00
Adrian Tiberius ed94ea9914 Android build fixes. 2015-06-03 14:18:55 +02:00
Adrian Tiberius 99b55f3353 Unit tests fixes ( 1 failing left ). 2015-06-01 21:31:10 +02:00
Adrian Tiberius 46a334e333 Removed old tests. 2015-06-01 21:17:58 +02:00
Adrian Tiberius 5f8e8fe91d Updated tests from develop branch. 2015-06-01 21:15:05 +02:00
Jarrad Hope 4b75601caa Merge branch 'android-test-poc9-rlpx' of opulence.git.beanstalkapp.com:/opulence/ethereumj into android-test-poc9-rlpx 2015-05-30 20:31:17 +02:00
Jarrad 8d9f8cf3d0 Merge pull request #2 from ligi/depend_on_antlr4
Make preBuild depend on antlr4
2015-05-30 20:26:45 +02:00
ligi 69aadc8f5b Make preBuild depend on antlr4 2015-05-30 19:25:18 +02:00
Adrian Tiberius e46c7b59db Cleaning:
- cleaned test app;
- moved android specific code to its own library (ethereum-core-android);
- moved ethereum-core from android library build back to java build;
2015-05-30 00:42:03 +02:00
Jarrad Hope c123b52182 update readme with fork deviations 2015-05-29 17:09:06 +02:00
Jarrad Hope aa5b92f7cb update readme with fork deviations 2015-05-29 17:05:30 +02:00
Jarrad Hope 6687633075 add gotcha to README 2015-05-28 20:27:57 +02:00
Jarrad Hope d4367013ac *sweeps under rug* 2015-05-28 20:24:36 +02:00
Jarrad Hope 9116a3a79c minor readme and config lint error ignore changes 2015-05-28 20:17:24 +02:00
Adrian Tiberius 97bcf7a92f Changed Readme 2015-05-28 19:46:11 +02:00
Yaroslav Dmytrotsa 0338d45a4f Merge branch 'android-test-poc9-rlpx' of https://opulence.git.beanstalkapp.com/ethereumj into android-test-poc9-rlpx 2015-05-28 19:17:42 +03:00
Yaroslav Dmytrotsa 2902058cd3 set all timeouts to 300 2015-05-28 19:17:13 +03:00
Adrian Tiberius a11fe4db44 develop branch merge 2015-05-28 13:48:14 +02:00
Yaroslav Dmytrotsa da38a89d49 increase peer.channel.read.timeout to prevent readTimeoutException. 2015-05-28 11:23:16 +03:00
Adrian Tiberius ff9c129235 Added missing files 2015-05-27 22:36:56 +02:00
Adrian Tiberius 035e990b7f Changed the node to the one in main develop branch. 2015-05-27 22:31:19 +02:00
Adrian Tiberius 8fe358c2f6 Latest merges from develop branch. 2015-05-27 22:09:04 +02:00
Adrian Tiberius 80bdbf0f66 More cleaning 2015-05-27 21:53:43 +02:00
Adrian Tiberius 779eddd9f9 More cleaning.
Started implementing BlockStore for android.
2015-05-27 20:05:59 +02:00
Adrian Tiberius 25506f3813 Some cleaning 2015-05-27 16:59:14 +02:00
Adrian Tiberius 92f2c29f69 Added missing files.
Some debugging changes.
2015-05-26 22:48:43 +02:00
Adrian Tiberius 43905b99a2 merged develop branch 2015-05-26 15:23:26 +02:00
Adrian Tiberius ccb8f4cdd1 Some files didn't upload to latest version. 2015-05-22 22:24:18 +02:00
Adrian Tiberius 9b29b9ea95 Replaced RoboSpring with Dagger2 2015-05-22 21:19:38 +02:00
Adrian Tiberius ea2fc0239f Merged poc-9-merge-rlpx from main repo. 2015-05-14 19:47:06 +02:00
Adrian Tiberius 22f70082c4 Hardcoded remoteId. 2015-05-14 18:44:47 +02:00
Adrian Tiberius abd6ef1d4c Working netty version. Added missing dependency. 2015-05-14 17:32:03 +02:00
Adrian Tiberius 856cea2867 Added missing files from previous commit. Added Android-studio-material ui. 2015-05-14 16:22:19 +02:00
Adrian Tiberius 0b5f6f9c02 Merged poc-9 branch.
Some minimalistic console ui implementation.
2015-05-14 13:38:26 +02:00
Adrian Tiberius ff71583142 Readded serpent.
Reenabled antlr.
2015-05-06 19:26:56 +02:00
Adrian Tiberius fb31912de4 jsontestsuite android fixes. 2015-05-06 16:00:34 +02:00
Adrian Tiberius b85abefebd Readded jsontestingsuite.
Removed hibernate dependency.
2015-05-06 15:59:02 +02:00
Adrian Tiberius 2905d43200 Tested and working on android 4.2+. 2015-05-06 00:10:29 +02:00
Jarrad Hope ebb3224d8c added missing support-v4, no luck 2015-05-03 11:52:48 +07:00
Jarrad Hope 24436bb77e attempt to resolve some samsung issue, no luck 2015-05-03 11:37:30 +07:00
Jarrad Hope ed43eb9a0a deleting things we probably need later 2015-05-03 09:34:49 +07:00
Jarrad Hope adda509526 renamed ethereum-core to ethereumj-core 2015-05-02 19:31:23 +07:00
Adrian Tiberius 3d3e8f82c5 Succesfull app run:
Replaced spring framework with robospring.
Changed ethereumj-core build to android-library.
Disabled BlockStoreImpl until we make it android compatible( use InMemoryBlockstore ).
Disabled antlr4 dependencies.
Commented some dependencies(needs testing before enabling).
Excluded dom4j and org.jboss.spec.javax.transaction dependencies (problems with android).
Change to netty 4.0.18.Final (this seems to work with android; latest 4.1 and 5.0 presented some problems; needs additional testing).
2015-04-28 20:08:04 +02:00
Adrian Tiberius 781e23ec70 Removed ethereumj-studio. 2015-04-28 19:17:05 +02:00
Adrian Tiberius 1d3782c3be Added android app wrapper 2015-04-28 20:14:10 +03:00
eugene-shevchenko a23617afda VM trace JSON serialization bugfix. 2015-04-09 22:42:52 +03:00
eugene-shevchenko 429d1025a2 Merge branch 'vm-trace-listener' 2015-04-09 11:49:43 +03:00