ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-29 15:43:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Upgraded Mockito and targetCompatibility to 11 (REVISIT).

Browse Source
This commit is contained in:
josecoll 2019-05-14 19:16:18 +01:00
parent a0a4318cc0
commit 9183e401c3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@ -1,4 +1,5 @@
import static org.gradle.api.JavaVersion.VERSION_1_8 import static org.gradle.api.JavaVersion.VERSION_1_8
import static org.gradle.api.JavaVersion.VERSION_11
buildscript { buildscript {
// For sharing constants between builds // For sharing constants between builds
@ -48,7 +49,7 @@ buildscript {
ext.junit_vintage_version = '5.5.0-M1' ext.junit_vintage_version = '5.5.0-M1'
ext.junit_jupiter_version = '5.5.0-M1' ext.junit_jupiter_version = '5.5.0-M1'
ext.junit_platform_version = '1.4.2' ext.junit_platform_version = '1.4.2'
ext.mockito_version = '2.18.3' ext.mockito_version = '2.24.0'
ext.mockito_kotlin_version = '1.5.0' ext.mockito_kotlin_version = '1.5.0'
ext.hamkrest_version = '1.4.2.2' ext.hamkrest_version = '1.4.2.2'
ext.jopt_simple_version = '5.0.2' ext.jopt_simple_version = '5.0.2'
@ -163,7 +164,7 @@ apply plugin: 'java'
//apply plugin: 'org.javamodularity.moduleplugin' //apply plugin: 'org.javamodularity.moduleplugin'
sourceCompatibility = VERSION_1_8 sourceCompatibility = VERSION_1_8
targetCompatibility = VERSION_1_8 targetCompatibility = VERSION_11
println "Java version: " + JavaVersion.current() println "Java version: " + JavaVersion.current()
println "Java source compatibility: " + sourceCompatibility println "Java source compatibility: " + sourceCompatibility
println "Java target compatibility: " + targetCompatibility println "Java target compatibility: " + targetCompatibility
@ -233,7 +234,7 @@ allprojects {
} }
} }
sourceCompatibility = VERSION_1_8 sourceCompatibility = VERSION_1_8
targetCompatibility = VERSION_1_8 targetCompatibility = VERSION_11
jacoco { jacoco {
// JDK11 official support (https://github.com/jacoco/jacoco/releases/tag/v0.8.3) // JDK11 official support (https://github.com/jacoco/jacoco/releases/tag/v0.8.3)
@ -241,7 +242,8 @@ allprojects {
} }
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" << "-Xlint:-options" << "-parameters" options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" << "-Xlint:-options" << "-parameters"
//<< "--illegal-access=warn"
options.encoding = 'UTF-8' options.encoding = 'UTF-8'
options.verbose = true options.verbose = true
// moduleOptions { // moduleOptions {