67 Commits

Author SHA1 Message Date
Adrian Tiberius
a75f74f9f2 Merged latest develop.
Added Scanner implementation for BlockLoader.
2015-06-17 14:50:47 +02:00
Adrian Tiberius
0250ffbd65 Merged latest develop changes. 2015-06-11 18:47:26 +02:00
Adrian Tiberius
b36e784bd5 Fix for lint OutOfMemory error.
Finished implementing blockstore for android using ormlite.
2015-06-10 19:38:43 +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
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
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
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
Adrian Tiberius
a11fe4db44 develop branch merge 2015-05-28 13:48:14 +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
9b29b9ea95 Replaced RoboSpring with Dagger2 2015-05-22 21:19:38 +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
b85abefebd Readded jsontestingsuite.
Removed hibernate dependency.
2015-05-06 15:59:02 +02: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
Roman Mandeleil
ebfdb860a8 Finalize only master push feature 2015-03-27 17:21:28 +03:00
Roman Mandeleil
28b39a90ca Empty commit 2015-03-27 17:17:34 +03:00
Roman Mandeleil
eb72c20f6d Pushing empty commit 2015-03-27 12:47:15 +03:00
Roman Mandeleil
6e92c3a5e0 Fix branch name env var 2015-03-27 12:43:45 +03:00
Roman Mandeleil
114595bb01 Fix branch name env var 2015-03-27 12:38:05 +03:00
Roman Mandeleil
1fb2e0af0c Fix publish only on master 2015-03-27 12:34:41 +03:00
Roman Mandeleil
1e7217ea3d Test not publishing build 2015-03-27 12:29:04 +03:00
Roman Mandeleil
0356258999 Fix: publish one if building on master branch 2015-03-27 12:21:07 +03:00
Roman Mandeleil
0599ba0be2 Publish one if building on master branch 2015-03-27 12:03:42 +03:00
Roman Mandeleil
ccd8eb4b07 Set testing setup and upgrade gradle wrapper version 2015-03-16 23:53:18 +02:00
Devrandom
3f79565b69 ECIES matching go-ethereum 2015-03-12 12:12:07 -07:00
Faiz Khan
2102792f23 Auto loader for per-commit tests 2015-03-06 11:11:34 -06:00
Chris Beams
63bb2aa852
Upgrade to antlr v4.5
Pick up the fix to antlr/antlr4#487 to eliminate spurious annotation
processor warnings.

Fixes #185
2015-01-30 14:05:56 +01:00
Chris Beams
9127c01890
Polish formatting
The sources affected by this commit have drifted in style since earlier
polishing commits such as f34d1f4 and a155518. The shared IDEA style
configuration file can help avoid this drift in the future. Simply run
Code->Reformat Code at the project level prior to committing. Note that
this code style configuration is not perfect, and not every change it
makes should be checked in. The ideal is to simply always write code that
conforms to the style conventions, but the automated settings are there
as a helping hand when necessary.

The churn caused by drifting style and the commits that fix it damage the
utility of git over time. Reviewing changes, analyzing history, surgically
reverting commits, and many other use cases with git simply do not work as
well when styles get mixed and fixed. Let's work toward a common style.
2015-01-20 12:20:09 +01:00
Roman Mandeleil
a9b410b38a Fix file encoding for testing 2015-01-19 22:18:14 +02:00
Roman Mandeleil
38cf19015b Introduce usage of key/val data source as abstraction
Implement Redis  key/val datasource
Implement LevelDb key/val datasource
2015-01-18 23:32:30 +02:00
Chris Beams
84b1cef682
Increase stack size during testing
This is in order to accommodate GitHubStateTest#stSystemOperationsTest,
which tests Ethereum's rules around maximum call stack depth, and thus
requires increasing Java's own defaults.

If this option is not set, this test results in a
StackOverflowException. Note that the setting is applied to Gradle's
`test` closure as opposed to a the global `JAVA_OPTS` environment
variable, because Gradle spawns a new process for executing tests.
2015-01-07 08:55:49 +01:00
Chris Beams
1c354cb736
Re-enable Bintray upload support
Thanks to @jbaruch for his comments at
https://github.com/ethereum/ethereumj/commit/00aba13#commitcomment-9167542
2015-01-06 14:08:17 +01:00
Chris Beams
00aba13a3d
Remove Bintray upload support for now
There is a known issue with Gradle's new `maven-publish` plugin that
causes all dependencies in the published pom to runtime-scoped [1]. This
causes conflicts with our use of Spring's `propdeps` Gradle plugin that
introduces optional and provided scopes.

This commit drops down to using Gradle's older, orginal `maven` plugin,
and JFrog's old-style `artifactory-publish` plugin in order to preserve
propdeps support.

This means removing JFrog's `bintray` plugin, as it appears to depend on
the `maven-publish` plugin. For the moment, ethereumj only really needs
to publish snapshots, and this is still supported. This is a stopgap
measure; it will be necessary to deal with getting uploads to
Bintray/JCenter working again once we're ready for a non-snapshot
release, but this can be dealt with later.

[1]: http://forums.gradle.org/gradle/topics/maven_publish_plugin_generated_pom_making_dependency_scope_runtime
2015-01-06 11:50:03 +01:00
Chris Beams
04ba6c4ed7
Customize pom for publication to Maven Central 2015-01-06 11:22:12 +01:00
Chris Beams
7452765d62
Upgrade to Gradle propdeps plugin v0.0.7 2015-01-06 11:21:59 +01:00
Chris Beams
2165bd506e
Avoid transitive dependency on various logging libs
Use Spring's `propdeps` plugin to introduce optional/provided scopes for
gradle dependencies. Mark libraries such as slf4j-log4j12 as optional.
These libraries are required to run a local ethereumj node, but they are
not required in order to compile against ethereumj in a downstream
appliaction. These libraries easily can cause conflicts, for example if
another slf4j-* library (such as slf4j-logback) is on the classpath.
2015-01-05 18:52:34 +01:00
Chris Beams
b977605771
Declare concrete slf4j logging deps as runtime-scoped 2015-01-05 15:12:51 +01:00
Chris Beams
aa7191d4a6
Re-enable publication of coverage reports
Prior to this commit, jacoco coverage report XML files were not actually
being written to disk, meaning that the Gradle coveralls plugin had
nothing to publish to https://coveralls.io/r/ethereum/ethereumj. HTML
reports are now being written as well, for convenient local browsing.
2014-12-30 20:52:25 +01:00