Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

Commit

Permalink
Changes to support Gradle 5.0 (#371)
Browse files Browse the repository at this point in the history
* Explicitly declare some dependencies for the acceptance tests
** rxjava2
** Java-WebSocket
** web3j:abi and web3j:crypto
* Change annotation processor path declaration
  • Loading branch information
shemnon authored Dec 6, 2018
1 parent c8e1c07 commit d9a7ad2
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
4 changes: 4 additions & 0 deletions acceptance-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down
6 changes: 6 additions & 0 deletions gradle/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -57,14 +59,18 @@ 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'
dependency 'org.openjdk.jmh:jmh-generator-annprocess:1.21'

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'
}
Expand Down

0 comments on commit d9a7ad2

Please sign in to comment.