Merged in clint-deployfix (pull request #514)

Fixed another cordformation bug caused by having them in a non-root project.
This commit is contained in:
Clinton Alexander 2016-11-21 17:53:55 +00:00
commit 590bf2724c
3 changed files with 4 additions and 4 deletions

3
.gitignore vendored
View File

@ -32,8 +32,7 @@ lib/dokka.jar
.idea/libraries
.idea/shelf
.idea/dataSources
!.idea/modules.xml
.idea/modules.xml
# if you remove the above rule, at least ignore the following:

View File

@ -15,6 +15,7 @@ buildscript {
ext.bouncycastle_version = '1.54'
repositories {
mavenLocal()
mavenCentral()
jcenter()
// TODO: Remove this once all packages are published to jcenter or maven central. (M6 or 7).
@ -27,7 +28,7 @@ buildscript {
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.1'
classpath 'net.corda.plugins:cordformation:0.5.1'
classpath 'net.corda.plugins:cordformation:0.5.2'
// Can run 'gradle dependencyUpdates' to find new versions of things.
classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'

View File

@ -23,7 +23,7 @@ class Cordformation implements Plugin<Project> {
* @return A file handle to the file in the JAR.
*/
static File getPluginFile(Project project, String filePathInJar) {
return project.resources.text.fromArchiveEntry(project.buildscript.configurations.classpath.find {
return project.rootProject.resources.text.fromArchiveEntry(project.rootProject.buildscript.configurations.classpath.find {
it.name.contains('cordformation')
}, filePathInJar).asFile()
}