Gradle 6.3 upgrade (#822)

* Change gradle version to 6.3
  * Enables Java 14
* clean up Gradle compatibility warnings
* fix stray dependency version

Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com>
This commit is contained in:
Danno Ferrin
2020-05-01 22:55:17 -06:00
committed by GitHub
parent 5a7e1fcd28
commit 0bbde72f47
5 changed files with 9 additions and 9 deletions

View File

@@ -33,8 +33,11 @@ dependencies {
testImplementation project(':testutil')
testImplementation project(':util')
testImplementation 'com.github.tomakehurst:wiremock-jre8-standalone'
testImplementation 'commons-io:commons-io'
testImplementation 'junit:junit'
testImplementation 'net.consensys:orion'
testImplementation 'org.apache.commons:commons-compress'
testImplementation 'org.apache.tuweni:tuweni-crypto'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.awaitility:awaitility'
@@ -42,10 +45,6 @@ dependencies {
testImplementation 'org.web3j:besu'
testImplementation 'tech.pegasys.ethsigner.internal:core'
testImplementation 'tech.pegasys.ethsigner.internal:file-based'
testImplementation 'org.apache.commons:commons-compress'
testImplementation 'commons-io:commons-io'
testCompile "com.github.tomakehurst:wiremock-jre8-standalone:2.25.1"
}
test.enabled = false

View File

@@ -502,7 +502,7 @@ startScripts {
dependencies {
compile project(':besu')
implementation project(':besu')
errorprone 'com.google.errorprone:error_prone_core'
}

View File

@@ -19,12 +19,12 @@ apply plugin: 'application'
apply plugin: 'idea'
jar {
baseName 'besu-evmtool'
archiveBaseName = 'besu-evmtool'
manifest {
attributes(
'Specification-Title': baseName,
'Specification-Title': archiveBaseName,
'Specification-Version': project.version,
'Implementation-Title': baseName,
'Implementation-Title': archiveBaseName,
'Implementation-Version': calculateVersion()
)
}

View File

@@ -19,6 +19,7 @@ dependencyManagement {
dependency 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.0'
dependency 'com.github.tomakehurst:wiremock-jre8:2.25.1'
dependency 'com.github.tomakehurst:wiremock-jre8-standalone:2.25.1'
dependency 'com.google.auto.service:auto-service:1.0-rc6'

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists