Merge remote-tracking branch 'origin/master' into android

Author: conor10

README.rst

@@ -76,7 +76,7 @@ Java 8:
    <dependency>
      <groupId>org.web3j</groupId>
      <artifactId>core</artifactId>
-     <version>1.0.5</version>
+     <version>1.0.6</version>
    </dependency>
 
 Android:
@@ -86,7 +86,7 @@ Android:
    <dependency>
      <groupId>org.web3j</groupId>
      <artifactId>core-android</artifactId>
-     <version>1.0.5</version>
+     <version>1.0.6</version>
    </dependency>
 
 Gradle
@@ -96,13 +96,13 @@ Java 8:
 
 .. code-block:: groovy
 
-   compile ('org.web3j:core:1.0.5')
+   compile ('org.web3j:core:1.0.6')
 
 Android:
 
 .. code-block:: groovy
 
-   compile ('org.web3j:core-android:1.0.5')
+   compile ('org.web3j:core-android:1.0.6')
 
 
 Start a client

build.gradle

@@ -9,7 +9,7 @@ buildscript {
 }
 
 plugins {
-    id "com.jfrog.bintray" version "1.6"  // version 1.7 requires JDK8
+    id "com.jfrog.bintray" version "1.7.3"
 }
 
 apply plugin: 'java'
@@ -218,7 +218,7 @@ task release {
     dependsOn 'build'
     dependsOn 'uploadArchives'
     dependsOn 'closeAndPromoteRepository'
-    dependsOn 'bintrayUpload'  // doesn't work with JDK7
+    dependsOn 'bintrayUpload'
 
     tasks.findByName('build').mustRunAfter 'clean'
 

docs/source/getting_started.rst

@@ -13,7 +13,7 @@ Java 8:
    <dependency>
      <groupId>org.web3j</groupId>
      <artifactId>core</artifactId>
-     <version>1.0.5</version>
+     <version>1.0.6</version>
    </dependency>
 
 Android:
@@ -23,7 +23,7 @@ Android:
    <dependency>
      <groupId>org.web3j</groupId>
      <artifactId>core-android</artifactId>
-     <version>1.0.5</version>
+     <version>1.0.6</version>
    </dependency>
 
 Gradle
@@ -33,13 +33,13 @@ Java 8:
 
 .. code-block:: groovy
 
-   compile ('org.web3j:core:1.0.5')
+   compile ('org.web3j:core:1.0.6')
 
 Android:
 
 .. code-block:: groovy
 
-   compile ('org.web3j:core-android:1.0.5')
+   compile ('org.web3j:core-android:1.0.6')
 
 
 Start a client