From ee3106fd5a82227d799bc70723ed8abb40a523c7 Mon Sep 17 00:00:00 2001 From: Mat Rizzo Date: Thu, 26 Oct 2017 16:49:15 +0100 Subject: [PATCH] CORDA-742 PR #1951 Moved extension methods back. --- .../src/main/kotlin/net/corda/plugins/Cordform.kt | 2 +- .../src/main/kotlin/net/corda/plugins/Node.kt | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Cordform.kt b/gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Cordform.kt index 2b208a2ce9..48642e4312 100644 --- a/gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Cordform.kt +++ b/gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Cordform.kt @@ -224,6 +224,6 @@ open class Cordform : DefaultTask() { } } } - + private fun logFile(): Path = this.logDirectory().resolve("generate-info.log") private fun ProcessBuilder.addEnvironment(key: String, value: String) = this.apply { environment().put(key, value) } } diff --git a/gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Node.kt b/gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Node.kt index 3c97fb140f..ef98848e18 100644 --- a/gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Node.kt +++ b/gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Node.kt @@ -24,10 +24,9 @@ class Node(private val project: Project) : CordformNode() { val capsuleCacheDir: String = "./cache" } - fun fullPath(): Path = project.projectDir.toPath().resolve(this.nodeDir.toPath()) - fun logDirectory(): Path = this.fullPath().resolve("logs") - fun makeLogDirectory() = Files.createDirectories(this.logDirectory()) - fun logFile(): Path = this.logDirectory().resolve("generate-info.log") + fun fullPath(): Path = project.projectDir.toPath().resolve(nodeDir.toPath()) + fun logDirectory(): Path = fullPath().resolve("logs") + fun makeLogDirectory() = Files.createDirectories(logDirectory()) /** * Set the list of CorDapps to install to the plugins directory. Each cordapp is a fully qualified Maven