From d9a7ad2eb837bd338a4c2d245e4bf338e4c7c95e Mon Sep 17 00:00:00 2001
From: Danno Ferrin <danno.ferrin@shemnon.com>
Date: Thu, 6 Dec 2018 14:02:31 -0700
Subject: [PATCH] Changes to support Gradle 5.0 (#371)

* Explicitly declare some dependencies for the acceptance tests
** rxjava2
** Java-WebSocket
** web3j:abi and web3j:crypto
* Change annotation processor path declaration
---
 acceptance-tests/build.gradle | 4 ++++
 build.gradle                  | 5 +----
 gradle/versions.gradle        | 6 ++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/acceptance-tests/build.gradle b/acceptance-tests/build.gradle
index 4bb3ccfec4..8d589c48cf 100644
--- a/acceptance-tests/build.gradle
+++ b/acceptance-tests/build.gradle
@@ -30,12 +30,16 @@ dependencies {
 
   testImplementation 'com.google.guava:guava'
   testImplementation 'com.squareup.okhttp3:okhttp'
+  testImplementation 'io.reactivex.rxjava2:rxjava'
   testImplementation 'io.vertx:vertx-core'
   testImplementation 'junit:junit'
   testImplementation 'org.apache.logging.log4j:log4j-api'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.awaitility:awaitility'
+  testImplementation 'org.java-websocket:Java-WebSocket'
+  testImplementation 'org.web3j:abi'
   testImplementation 'org.web3j:core'
+  testImplementation 'org.web3j:crypto'
 }
 
 test.enabled = false
diff --git a/build.gradle b/build.gradle
index e11d7bac38..b7563e3ba6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -386,10 +386,7 @@ configure(subprojects.findAll {it.name != 'errorprone-checks'}) {
   dependencies { annotationProcessor project(":errorprone-checks") }
 
   tasks.withType(JavaCompile) {
-    options.compilerArgs += [
-      '-processorpath',
-      configurations.annotationProcessor.asPath
-    ]
+    options.annotationProcessorPath = configurations.annotationProcessor
   }
 }
 
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
index 2b482053b0..2afd886aa9 100644
--- a/gradle/versions.gradle
+++ b/gradle/versions.gradle
@@ -38,6 +38,8 @@ dependencyManagement {
     dependency "io.prometheus:simpleclient:0.5.0"
     dependency "io.prometheus:simpleclient_hotspot:0.5.0"
 
+    dependency 'io.reactivex.rxjava2:rxjava:2.2.2'
+
     dependency 'io.vertx:vertx-codegen:3.5.4'
     dependency 'io.vertx:vertx-core:3.5.4'
     dependency 'io.vertx:vertx-unit:3.5.4'
@@ -57,6 +59,8 @@ dependencyManagement {
 
     dependency 'org.bouncycastle:bcprov-jdk15on:1.60'
 
+    dependency 'org.java-websocket:Java-WebSocket:1.3.8'
+
     dependency 'org.mockito:mockito-core:2.23.4'
 
     dependency 'org.openjdk.jmh:jmh-core:1.21'
@@ -64,7 +68,9 @@ dependencyManagement {
 
     dependency 'org.rocksdb:rocksdbjni:5.15.10'
 
+    dependency 'org.web3j:abi:4.0.1'
     dependency 'org.web3j:core:4.0.1'
+    dependency 'org.web3j:crypto:4.0.1'
 
     dependency 'org.xerial.snappy:snappy-java:1.1.7.2'
   }