azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Native: Use NIO Files.createTemp*() in favor of File.createTemp*() extension functions

Browse Source
This commit is contained in:
Dmitriy Dolovov
2020-11-11 13:11:23 +03:00
parent 47e2656ca9
commit ee7f3b1bfe
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/nativeToolRunners.kt
+2 -1
View File
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.konan.properties.resolvablePropertyString
import org.jetbrains.kotlin.konan.target.HostManager import org.jetbrains.kotlin.konan.target.HostManager
import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.konan.target.KonanTarget
import org.jetbrains.kotlin.konan.util.DependencyDirectories import org.jetbrains.kotlin.konan.util.DependencyDirectories
import java.nio.file.Files
import java.util.* import java.util.*
private val Project.jvmArgs private val Project.jvmArgs
@@ -127,7 +128,7 @@ internal class KotlinNativeCompilerRunner(project: Project) : KotlinNativeToolRu
override fun transformArgs(args: List<String>): List<String> { override fun transformArgs(args: List<String>): List<String> {
if (!useArgFile) return super.transformArgs(args) if (!useArgFile) return super.transformArgs(args)
val argFile = createTempFile(prefix = "kotlinc-native-args", suffix = ".lst").apply { deleteOnExit() } val argFile = Files.createTempFile(/* prefix = */ "kotlinc-native-args", /* suffix = */ ".lst").toFile().apply { deleteOnExit() }
argFile.printWriter().use { w -> argFile.printWriter().use { w ->
args.forEach { arg -> args.forEach { arg ->
val escapedArg = arg val escapedArg = arg
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CommonizerTask.kt
+11 -12
View File
@@ -105,11 +105,10 @@ internal data class CommonizerTaskParams(
val parentDir = destinationDir.parentFile val parentDir = destinationDir.parentFile
parentDir.mkdirs() parentDir.mkdirs()
val destinationTmpDir = createTempDir( val destinationTmpDir = Files.createTempDirectory(
prefix = "tmp-" + destinationDir.name, /* dir = */ parentDir.toPath(),
suffix = ".new", /* prefix = */ "tmp-new-" + destinationDir.name
directory = parentDir ).toFile()
)
commandLineArguments += "native-dist-commonize" commandLineArguments += "native-dist-commonize"
commandLineArguments += "-distribution-path" commandLineArguments += "-distribution-path"
@@ -256,16 +255,16 @@ private fun renameToTempAndDelete(directory: File) {
directory directory
} else { } else {
// first, rename the directory to some temp directory // first, rename the directory to some temp directory
val tempDir = createTempFile( val tempDir = Files.createTempFile(
prefix = "tmp-" + directory.name, /* dir = */ directory.parentFile.toPath(),
suffix = ".old", /* prefix = */ "tmp-old-" + directory.name,
directory = directory.parentFile /* suffix = */ null
) )
tempDir.delete() Files.delete(tempDir)
Files.move(directory.toPath(), tempDir.toPath(), StandardCopyOption.ATOMIC_MOVE) Files.move(directory.toPath(), tempDir, StandardCopyOption.ATOMIC_MOVE)
tempDir tempDir.toFile()
} }
dirToRemove.deleteRecursively() dirToRemove.deleteRecursively()