ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-02 07:30:53 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-1985: Configure Gradle capsule plugin to use Capsule 1.0.3. (#3949)

Browse Source
This commit is contained in:
Chris Rankin 2018-09-17 13:55:31 +01:00 committed by GitHub
parent 160bc147ed
commit df4699c69a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@ -17,9 +17,9 @@ buildscript {
ext.quasar_group = 'co.paralleluniverse' ext.quasar_group = 'co.paralleluniverse'
ext.quasar_version = '0.7.10' ext.quasar_version = '0.7.10'
// gradle-capsule-plugin:1.0.2 contains capsule:1.0.1 // gradle-capsule-plugin:1.0.2 contains capsule:1.0.1 by default.
// TODO: Upgrade gradle-capsule-plugin to a version with capsule:1.0.3 // We must configure it manually to use the latest capsule version.
ext.capsule_version = '1.0.1' ext.capsule_version = '1.0.3'
ext.asm_version = '5.0.4' ext.asm_version = '5.0.4'
ext.artemis_version = '2.6.2' ext.artemis_version = '2.6.2'
@ -114,8 +114,8 @@ buildscript {
plugins { plugins {
// TODO The capsule plugin requires the newer DSL plugin block.It would be nice if we could unify all the plugins into one style, // TODO The capsule plugin requires the newer DSL plugin block.It would be nice if we could unify all the plugins into one style,
// but the DSL has some restrictions e.g can't be used on the allprojects section. So we should revisit this if there are improvements in Gradle. // but the DSL has some restrictions e.g can't be used on the allprojects section. So we should revisit this if there are improvements in Gradle.
// Version 1.0.2 of this plugin uses capsule:1.0.1 // Version 1.0.2 of this plugin uses capsule:1.0.1 by default.
id "us.kirchmeier.capsule" version "1.0.2" id 'us.kirchmeier.capsule' version '1.0.2' apply false
// Add the shadow plugin to the plugins classpath for the entire project. // Add the shadow plugin to the plugins classpath for the entire project.
id 'com.github.johnrengelman.shadow' version '2.0.4' apply false id 'com.github.johnrengelman.shadow' version '2.0.4' apply false

4
node/capsule/build.gradle
View File

@ -28,6 +28,10 @@ targetCompatibility = 1.6
jar.enabled = false jar.enabled = false
capsule {
version capsule_version
}
task buildCordaJAR(type: FatCapsule, dependsOn: project(':node').tasks.jar) { task buildCordaJAR(type: FatCapsule, dependsOn: project(':node').tasks.jar) {
applicationClass 'net.corda.node.Corda' applicationClass 'net.corda.node.Corda'
archiveName "corda-${corda_release_version}.jar" archiveName "corda-${corda_release_version}.jar"

4
tools/explorer/capsule/build.gradle
View File

@ -19,6 +19,10 @@ configurations {
sourceCompatibility = 1.6 sourceCompatibility = 1.6
targetCompatibility = 1.6 targetCompatibility = 1.6
capsule {
version capsule_version
}
task buildExplorerJAR(type: FatCapsule, dependsOn: project(':tools:explorer').tasks.jar) { task buildExplorerJAR(type: FatCapsule, dependsOn: project(':tools:explorer').tasks.jar) {
applicationClass 'net.corda.explorer.Main' applicationClass 'net.corda.explorer.Main'
archiveName "node-explorer-${corda_release_version}.jar" archiveName "node-explorer-${corda_release_version}.jar"

4
webserver/webcapsule/build.gradle
View File

@ -28,6 +28,10 @@ targetCompatibility = 1.6
jar.enabled = false jar.enabled = false
capsule {
version capsule_version
}
task buildWebserverJar(type: FatCapsule, dependsOn: project(':node').tasks.jar) { task buildWebserverJar(type: FatCapsule, dependsOn: project(':node').tasks.jar) {
applicationClass 'net.corda.webserver.WebServer' applicationClass 'net.corda.webserver.WebServer'
archiveName "corda-webserver-${corda_release_version}.jar" archiveName "corda-webserver-${corda_release_version}.jar"