ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 04:57:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merged in clint-cordformdepsfix (pull request #509)

Browse Source 
Fixed some issues and inconsistencies with gradle plugins
This commit is contained in:
Clinton Alexander 2016-11-21 14:21:17 +00:00
commit e34820a480
10 changed files with 14 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -26,8 +26,8 @@ buildscript {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
classpath 'net.corda.plugins:publish-utils:0.5'
classpath 'net.corda.plugins:quasar-utils:0.5'
classpath 'net.corda.plugins:cordformation:0.5'
classpath 'net.corda.plugins:quasar-utils:0.5.1'
classpath 'net.corda.plugins:cordformation:0.5.1'
// Can run 'gradle dependencyUpdates' to find new versions of things.
classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'

6
gradle-plugins/build.gradle
View File

@ -20,7 +20,11 @@ apply plugin: 'maven-publish'
allprojects {
group 'net.corda'
version "$corda_published_version"
version "$corda_version"
}
subprojects {
task(install, dependsOn: 'publishToMavenLocal')
}
// Aliasing the publishToMavenLocal for simplicity.

2
gradle-plugins/publish-utils/build.gradle
View File

@ -34,8 +34,6 @@ bintray {
}
}
task(install, dependsOn: 'publishToMavenLocal')
publishing {
publications {
publishUtils(MavenPublication) {

2
gradle-plugins/quasar-utils/build.gradle
View File

@ -25,8 +25,6 @@ bintray {
}
}
task(install, dependsOn: 'publishToMavenLocal')
publishing {
publications {
quasarUtils(MavenPublication) {

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

@ -46,13 +46,14 @@ class QuasarPlugin implements Plugin<Project> {
ant.taskdef(name:'scanSuspendables', classname:'co.paralleluniverse.fibers.instrument.SuspendablesScanner',
classpath: "${project.sourceSets.main.output.classesDir}:${project.sourceSets.main.output.resourcesDir}:${project.configurations.runtime.asPath}")
project.delete "$project.sourceSets.main.output.resourcesDir/META-INF/suspendables", "$project.sourceSets.main.output.resourcesDir/META-INF/suspendable-supers"
ant.scanSuspendables(
auto:false,
suspendablesFile: "$project.sourceSets.main.output.resourcesDir/META-INF/suspendables",
supersFile: "$project.sourceSets.main.output.resourcesDir/META-INF/suspendable-supers") {
fileset(dir: project.sourceSets.main.output.classesDir)
if(project.sourceSets.main.output.classesDir.exists()) {
ant.scanSuspendables(
auto:false,
suspendablesFile: "$project.sourceSets.main.output.resourcesDir/META-INF/suspendables",
supersFile: "$project.sourceSets.main.output.resourcesDir/META-INF/suspendable-supers") {
fileset(dir: project.sourceSets.main.output.classesDir)
}
}
}
project.jar.dependsOn project.quasarScan

17
samples/attachment-demo/build.gradle
View File

@ -1,20 +1,3 @@
buildscript {
ext.corda_version = "0.6-SNAPSHOT"
repositories {
mavenLocal()
mavenCentral()
jcenter()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "net.corda.plugins:quasar-utils:$corda_version"
classpath "net.corda.plugins:publish-utils:$corda_version"
classpath "net.corda.plugins:cordformation:$corda_version"
}
}
apply plugin: 'java'
apply plugin: 'kotlin'
apply plugin: 'idea'

15
samples/irs-demo/build.gradle
View File

@ -1,18 +1,3 @@
buildscript {
repositories {
mavenLocal()
mavenCentral()
jcenter()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "net.corda.plugins:quasar-utils:$corda_version"
classpath "net.corda.plugins:publish-utils:$corda_version"
classpath "net.corda.plugins:cordformation:$corda_version"
}
}
apply plugin: 'java'
apply plugin: 'kotlin'
apply plugin: 'idea'

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

@ -1,16 +1,3 @@
buildscript {
repositories {
mavenLocal()
mavenCentral()
jcenter()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "net.corda.plugins:quasar-utils:$corda_version"
}
}
apply plugin: 'java'
apply plugin: 'kotlin'
apply plugin: 'idea'

13
samples/simm-valuation-demo/build.gradle
View File

@ -1,18 +1,5 @@
buildscript {
ext.strata_version = '1.0.0'
repositories {
mavenLocal()
mavenCentral()
jcenter()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "net.corda.plugins:quasar-utils:$corda_version"
classpath "net.corda.plugins:publish-utils:$corda_version"
classpath "net.corda.plugins:cordformation:$corda_version"
}
}
apply plugin: 'java'

15
samples/trader-demo/build.gradle
View File

@ -1,18 +1,3 @@
buildscript {
repositories {
mavenLocal()
mavenCentral()
jcenter()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "net.corda.plugins:quasar-utils:$corda_version"
classpath "net.corda.plugins:publish-utils:$corda_version"
classpath "net.corda.plugins:cordformation:$corda_version"
}
}
apply plugin: 'java'
apply plugin: 'kotlin'
apply plugin: 'idea'