From 97bcf7a92ff23a8ce95284c6db2db17d0e5ed965 Mon Sep 17 00:00:00 2001 From: Adrian Tiberius Date: Thu, 28 May 2015 19:46:11 +0200 Subject: [PATCH] Changed Readme --- README.md | 31 ++++--------------- ethereumj-core/build.gradle | 9 ++---- .../ethereum/net/server/ChannelManager.java | 2 -- 3 files changed, 8 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index e8188d4b..2e23c154 100644 --- a/README.md +++ b/README.md @@ -1,39 +1,20 @@ -# Welcome to ethereumj -[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/ethereum/ethereumj?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -[![Build Status](https://travis-ci.org/ethereum/ethereumj.svg?branch=master)](https://travis-ci.org/ethereum/ethereumj) -[![Coverage Status](https://coveralls.io/repos/ethereum/ethereumj/badge.png?branch=master)](https://coveralls.io/r/ethereum/ethereumj?branch=master) - - - -###### :small_blue_diamond: . -###### :small_blue_diamond: . Talk to us: http://forum.ethergit.com/categories/all -###### :small_blue_diamond: . - +# Welcome to ethereumj for android # About ethereumj is a pure-Java implementation of the Ethereum protocol. For high-level information about Ethereum and its goals, visit [ethereum.org](https://ethereum.org). The [ethereum white paper](https://github.com/ethereum/wiki/wiki/%5BEnglish%5D-White-Paper) provides a complete conceptual overview, and the [yellow paper](http://gavwood.com/Paper.pdf) provides a formal definition of the protocol. +This is an android version of ethereumj (https://github.com/ethereum/ethereumj). This repository consists of: - * [ethereum-core](ethereumj-core): a library suitable for inclusion in any JVM-based project. - * [ethereum-studio](ethereumj-studio): a simple GUI for exploring Ethereum functionality and usage of the ethereumj API. - -To see ethereum-studio in action, watch this [video](https://youtu.be/D5ok7jh7AOg). + * [ethereum-core](ethereumj-core): a android compatible library of ethereumj-core . + * [app]: a simple mockup GUI for exploring Ethereum functionality and usage. # Todo -The Ethereum protocol is under heavy development, thus so is this implementation. See the [todo list](TODO.md), GitHub [Issues](https://github.com/ethereum/ethereumj/issues) and [milestone schedule](https://github.com/ethereum/ethereumj/milestones). Issues are prioritized using [waffle](http://waffle.io/ethereum/ethereumj). - -# Contact -Chat with us via [Gitter](https://gitter.im/ethereum/ethereumj) or [#ethereumj](https://webchat.freenode.net/?channels=ethereumj) on Freenode. +This is a work in progress. # Building from source - Clone this repository and run `./gradlew build` (or at least `./gradlew antlr4` to generate sources). - - Import all sources into IntelliJ IDEA (14+) with `File->Import project` and point to the top-level `build.gradle` file. - - Make sure to set your language level in `File->Project Structure...` to JDK 8. - - Run `Build->Make Project`. When complete, there should be no errors. - -# Usage -For complete details on downloading, building and using [etherumj-core](ethereumj-core) and [ethereumj-studio](ethereumj-studio), see their respective readme files. + - Import gradle.build from the root folder into Android Studio. # License ethereumj is released under the [MIT license](LICENSE). diff --git a/ethereumj-core/build.gradle b/ethereumj-core/build.gradle index 728d73c2..1b0926b0 100644 --- a/ethereumj-core/build.gradle +++ b/ethereumj-core/build.gradle @@ -103,17 +103,12 @@ dependencies { compile('com.cedarsoftware:java-util:1.8.0') { exclude group: 'commons-logging', module: 'commons-logging' - } - // for deep equals + } // for deep equals - //compile 'org.antlr:antlr4-runtime:4.5' - - - // for serpent compilation + //compile 'org.antlr:antlr4-runtime:4.5' // for serpent compilation compile 'com.yuvalshavit:antlr-denter:1.1' - compile 'org.slf4j:slf4j-android:1.7.12' compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.13' diff --git a/ethereumj-core/src/main/java/org/ethereum/net/server/ChannelManager.java b/ethereumj-core/src/main/java/org/ethereum/net/server/ChannelManager.java index fcb250ec..a0cc4eca 100644 --- a/ethereumj-core/src/main/java/org/ethereum/net/server/ChannelManager.java +++ b/ethereumj-core/src/main/java/org/ethereum/net/server/ChannelManager.java @@ -44,8 +44,6 @@ public class ChannelManager { this.init(); } - - //@PostConstruct public void init() { scheduleChannelCollector(); }