ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-30 16:14:39 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Include Gradle JPMS plugin (v1.5.0)

Browse Source
This commit is contained in:
josecoll 2019-04-09 13:30:23 +01:00
parent ba675e73b9
commit 57fb63940f
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build.gradle
View File

@ -1,3 +1,5 @@
import static org.gradle.api.JavaVersion.VERSION_1_8
buildscript { buildscript {
// For sharing constants between builds // For sharing constants between builds
Properties constants = new Properties() Properties constants = new Properties()
@ -81,6 +83,7 @@ buildscript {
ext.jcabi_manifests_version = '1.1' ext.jcabi_manifests_version = '1.1'
ext.picocli_version = '3.8.0' ext.picocli_version = '3.8.0'
ext.commons_io_version = '2.6' ext.commons_io_version = '2.6'
ext.gradle_modules_plugin_version = constants.getProperty('gradleModulesPluginVersion')
// Name of the IntelliJ SDK created for the deterministic Java rt.jar. // Name of the IntelliJ SDK created for the deterministic Java rt.jar.
// ext.deterministic_idea_sdk = '1.8 (Deterministic)' // ext.deterministic_idea_sdk = '1.8 (Deterministic)'
@ -100,6 +103,10 @@ buildscript {
maven { maven {
url "$artifactory_contextUrl/corda-releases" url "$artifactory_contextUrl/corda-releases"
} }
// JDK11 Java modules gradle plugin
maven {
url "https://plugins.gradle.org/m2/"
}
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@ -118,6 +125,7 @@ buildscript {
classpath "net.i2p.crypto:eddsa:$eddsa_version" // Needed for ServiceIdentityGenerator in the build environment. classpath "net.i2p.crypto:eddsa:$eddsa_version" // Needed for ServiceIdentityGenerator in the build environment.
classpath "org.owasp:dependency-check-gradle:${dependency_checker_version}" classpath "org.owasp:dependency-check-gradle:${dependency_checker_version}"
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:$artifactory_plugin_version" classpath "org.jfrog.buildinfo:build-info-extractor-gradle:$artifactory_plugin_version"
classpath "org.javamodularity:moduleplugin:$gradle_modules_plugin_version"
// Capsule gradle plugin forked and maintained locally to support Gradle 5.x // Capsule gradle plugin forked and maintained locally to support Gradle 5.x
// See https://github.com/corda/gradle-capsule-plugin // See https://github.com/corda/gradle-capsule-plugin
classpath "us.kirchmeier:gradle-capsule-plugin:1.0.4_r3" classpath "us.kirchmeier:gradle-capsule-plugin:1.0.4_r3"
@ -145,15 +153,20 @@ apply plugin: 'com.jfrog.artifactory'
// with the run configurations. It also doesn't realise that the project is a Java 8 project and misconfigures // with the run configurations. It also doesn't realise that the project is a Java 8 project and misconfigures
// the resulting import. This fixes it. // the resulting import. This fixes it.
apply plugin: 'java' apply plugin: 'java'
sourceCompatibility = 1.8 apply plugin: 'org.javamodularity.moduleplugin'
targetCompatibility = 1.8
sourceCompatibility = VERSION_1_8
targetCompatibility = VERSION_1_8
println "Java version: " + JavaVersion.current()
println "Java source compatibility: " + sourceCompatibility
println "Java target compatibility: " + targetCompatibility
allprojects { allprojects {
apply plugin: 'kotlin' apply plugin: 'kotlin'
apply plugin: 'jacoco' apply plugin: 'jacoco'
apply plugin: 'org.owasp.dependencycheck' apply plugin: 'org.owasp.dependencycheck'
apply plugin: 'kotlin-allopen' apply plugin: 'kotlin-allopen'
apply plugin: 'org.javamodularity.moduleplugin'
allOpen { allOpen {
annotations( annotations(
@ -177,8 +190,8 @@ allprojects {
nugetconfEnabled = false nugetconfEnabled = false
} }
} }
sourceCompatibility = 1.8 sourceCompatibility = VERSION_1_8
targetCompatibility = 1.8 targetCompatibility = VERSION_1_8
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" << "-Xlint:-options" << "-parameters" options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" << "-Xlint:-options" << "-parameters"

1
constants.properties
View File

@ -23,3 +23,4 @@ snakeYamlVersion=1.19
caffeineVersion=2.6.2 caffeineVersion=2.6.2
metricsVersion=3.2.5 metricsVersion=3.2.5
metricsNewRelicVersion=1.1.1 metricsNewRelicVersion=1.1.1
gradleModulesPluginVersion=1.5.0