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

Demote quasar-core to a runtime dependency, and capsule to "compileOnly". (#1381)

Browse Source
This commit is contained in:
Chris Rankin
2017-09-01 11:12:04 +01:00
committed by GitHub
parent 2a794d9523
commit 66c35bbffa
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
constants.properties
View File

@ -1,5 +1,5 @@
gradlePluginsVersion=0.15.1 gradlePluginsVersion=0.15.2
kotlinVersion=1.1.4 kotlinVersion=1.1.4
guavaVersion=21.0 guavaVersion=21.0
bouncycastleVersion=1.57 bouncycastleVersion=1.57
typesafeConfigVersion=1.3.1 typesafeConfigVersion=1.3.1

3
core/build.gradle
View File

@ -28,6 +28,9 @@ dependencies {
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version" testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
// Quasar, for suspendable fibres.
compileOnly "co.paralleluniverse:quasar-core:$quasar_version:jdk8"
// Thread safety annotations // Thread safety annotations
compile "com.google.code.findbugs:jsr305:3.0.1" compile "com.google.code.findbugs:jsr305:3.0.1"

2
gradle-plugins/quasar-utils/src/main/groovy/net/corda/plugins/QuasarPlugin.groovy
View File

@ -14,7 +14,7 @@ class QuasarPlugin implements Plugin<Project> {
// To add a local .jar dependency: // To add a local .jar dependency:
// project.dependencies.add("quasar", project.files("${project.rootProject.projectDir}/lib/quasar.jar")) // project.dependencies.add("quasar", project.files("${project.rootProject.projectDir}/lib/quasar.jar"))
project.dependencies.add("quasar", "co.paralleluniverse:quasar-core:${project.rootProject.ext.quasar_version}:jdk8@jar") project.dependencies.add("quasar", "co.paralleluniverse:quasar-core:${project.rootProject.ext.quasar_version}:jdk8@jar")
project.dependencies.add("compile", project.configurations.getByName("quasar")) project.dependencies.add("runtime", project.configurations.getByName("quasar"))
project.tasks.withType(Test) { project.tasks.withType(Test) {
jvmArgs "-javaagent:${project.configurations.quasar.singleFile}" jvmArgs "-javaagent:${project.configurations.quasar.singleFile}"

4
node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
View File

@ -30,8 +30,10 @@ class FlowVersioningTest : NodeBasedTest() {
private class PretendInitiatingCoreFlow(val initiatedParty: Party) : FlowLogic<Pair<Int, Int>>() { private class PretendInitiatingCoreFlow(val initiatedParty: Party) : FlowLogic<Pair<Int, Int>>() {
@Suspendable @Suspendable
override fun call(): Pair<Int, Int> { override fun call(): Pair<Int, Int> {
// Execute receive() outside of the Pair constructor to avoid Kotlin/Quasar instrumentation bug.
val alicePlatformVersionAccordingToBob = receive<Int>(initiatedParty).unwrap { it }
return Pair( return Pair(
receive<Int>(initiatedParty).unwrap { it }, alicePlatformVersionAccordingToBob,
getFlowContext(initiatedParty).flowVersion getFlowContext(initiatedParty).flowVersion
) )
} }

2
samples/network-visualiser/build.gradle
View File

@ -20,7 +20,7 @@ dependencies {
// Cordapp dependencies // Cordapp dependencies
// GraphStream: For visualisation // GraphStream: For visualisation
compile 'co.paralleluniverse:capsule:1.0.3' compileOnly "co.paralleluniverse:capsule:$capsule_version"
compile "org.graphstream:gs-core:1.3" compile "org.graphstream:gs-core:1.3"
compile "org.graphstream:gs-ui:1.3" compile "org.graphstream:gs-ui:1.3"
} }

2
verifier/build.gradle
View File

@ -51,7 +51,7 @@ dependencies {
task standaloneJar(type: Jar) { task standaloneJar(type: Jar) {
// Create a fat jar by packing all deps into the output // Create a fat jar by packing all deps into the output
from { from {
configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } configurations.runtime.collect { it.isDirectory() ? it : zipTree(it) }
} }
with jar with jar
exclude("META-INF/*.DSA") exclude("META-INF/*.DSA")