From efc73f5d5df3a9763f6afeed84ae2d3046abea41 Mon Sep 17 00:00:00 2001 From: DevCharly Date: Sat, 2 Jul 2016 18:30:53 +0200 Subject: [PATCH 1/2] delete temporary "kobalt123.kt" files (in temp folder) --- src/main/kotlin/com/beust/kobalt/app/BuildFileCompiler.kt | 1 + src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/kotlin/com/beust/kobalt/app/BuildFileCompiler.kt b/src/main/kotlin/com/beust/kobalt/app/BuildFileCompiler.kt index ac994cee..0ab9fc84 100644 --- a/src/main/kotlin/com/beust/kobalt/app/BuildFileCompiler.kt +++ b/src/main/kotlin/com/beust/kobalt/app/BuildFileCompiler.kt @@ -95,6 +95,7 @@ public class BuildFileCompiler @Inject constructor(@Assisted("buildFiles") val b val taskResult = maybeCompileBuildFile(context, BuildFile(Paths.get(modifiedBuildFile.path), "Modified ${Constants.BUILD_FILE_NAME}", buildFile.realPath), buildScriptJarFile, pluginUrls) + modifiedBuildFile.delete() if (taskResult.success) { projects.addAll(buildScriptUtil.runBuildScriptJarFile(buildScriptJarFile, pluginUrls, context)) } else { diff --git a/src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt b/src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt index 219e3eda..abbf25a8 100644 --- a/src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt +++ b/src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt @@ -121,6 +121,7 @@ class ParsedBuildFile(val buildFile: BuildFile, val context: KobaltContext, val VersionFile.generateVersionFile(buildScriptJarFile.parentFile) Kobalt.context!!.internalContext.buildFileOutOfDate = true } + pluginSourceFile.delete() // // Run preBuildScript.jar to initialize plugins and repos From 86d651b648f894a43a8b2bf0a101dbcd138cb8a4 Mon Sep 17 00:00:00 2001 From: DevCharly Date: Mon, 4 Jul 2016 13:31:45 +0200 Subject: [PATCH 2/2] delete temporary "kobalt123.kt" files (in temp folder) on exit --- src/main/kotlin/com/beust/kobalt/app/BuildFileCompiler.kt | 3 +-- src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/app/BuildFileCompiler.kt b/src/main/kotlin/com/beust/kobalt/app/BuildFileCompiler.kt index 0ab9fc84..7bd3ab41 100644 --- a/src/main/kotlin/com/beust/kobalt/app/BuildFileCompiler.kt +++ b/src/main/kotlin/com/beust/kobalt/app/BuildFileCompiler.kt @@ -90,12 +90,11 @@ public class BuildFileCompiler @Inject constructor(@Assisted("buildFiles") val b // Write the modified Build.kt (e.g. maybe profiles were applied) to a temporary file, // compile it, jar it in buildScript.jar and run it - val modifiedBuildFile = KFiles.createTempFile(".kt") + val modifiedBuildFile = KFiles.createTempFile(".kt", deleteOnExit = true) KFiles.saveFile(modifiedBuildFile, parsedBuildFile.buildScriptCode) val taskResult = maybeCompileBuildFile(context, BuildFile(Paths.get(modifiedBuildFile.path), "Modified ${Constants.BUILD_FILE_NAME}", buildFile.realPath), buildScriptJarFile, pluginUrls) - modifiedBuildFile.delete() if (taskResult.success) { projects.addAll(buildScriptUtil.runBuildScriptJarFile(buildScriptJarFile, pluginUrls, context)) } else { diff --git a/src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt b/src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt index abbf25a8..6f9654ab 100644 --- a/src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt +++ b/src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt @@ -105,7 +105,7 @@ class ParsedBuildFile(val buildFile: BuildFile, val context: KobaltContext, val // Compile and run preBuildScriptCode, which contains all the plugins() calls extracted. This // will add all the dynamic plugins found in this code to Plugins.dynamicPlugins // - val pluginSourceFile = KFiles.createTempFile(".kt") + val pluginSourceFile = KFiles.createTempFile(".kt", deleteOnExit = true) pluginSourceFile.writeText(preBuildScriptCode, Charset.defaultCharset()) log(2, "Saved ${pluginSourceFile.absolutePath}") @@ -121,7 +121,6 @@ class ParsedBuildFile(val buildFile: BuildFile, val context: KobaltContext, val VersionFile.generateVersionFile(buildScriptJarFile.parentFile) Kobalt.context!!.internalContext.buildFileOutOfDate = true } - pluginSourceFile.delete() // // Run preBuildScript.jar to initialize plugins and repos