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

Split shared: Merge TargetDefFile.kt and DefFile.kt

Browse Source
This commit is contained in:
Ilya Matveev
2019-05-21 11:28:59 +03:00
committed by Ilya Matveev
parent 01b1734177
commit 873b40be80
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DefFile.kt
+3
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.konan.util package org.jetbrains.kotlin.konan.util
import org.jetbrains.kotlin.konan.target.KonanTarget
import java.io.File import java.io.File
import java.io.StringReader import java.io.StringReader
import java.util.* import java.util.*
@@ -163,3 +164,5 @@ private fun parseDefFile(file: File?, substitutions: Map<String, String>): Tripl
} }
private fun Properties.duplicate() = Properties().apply { putAll(this@duplicate) } private fun Properties.duplicate() = Properties().apply { putAll(this@duplicate) }
fun DefFile(file: File?, target: KonanTarget) = DefFile(file, defaultTargetSubstitutions(target))
shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/TargetDefFile.kt
-6
View File
@@ -1,6 +0,0 @@
package org.jetbrains.kotlin.konan.util
import org.jetbrains.kotlin.konan.target.KonanTarget
import java.io.File
fun DefFile(file: File?, target: KonanTarget) = DefFile(file, defaultTargetSubstitutions(target))