Revert "Revert "Cleanup TargetManager.kt a little bit""

This reverts commit 3dd25e49
This commit is contained in:
Sergey Bogolepov
2021-03-19 11:21:42 +07:00
committed by TeamCityServer
parent 1d8d76eb7f
commit 30e9c645f8

View File

@@ -9,8 +9,6 @@ interface TargetManager {
val target: KonanTarget
val targetName: String
fun list()
val hostTargetSuffix: String
val targetSuffix: String
}
internal class TargetManagerImpl(val userRequest: String?, val hostManager: HostManager) : TargetManager {
@@ -26,7 +24,7 @@ internal class TargetManagerImpl(val userRequest: String?, val hostManager: Host
}
}
fun determineCurrent(): KonanTarget {
private fun determineCurrent(): KonanTarget {
return if (userRequest == null || userRequest == "host") {
HostManager.host
} else {
@@ -34,9 +32,6 @@ internal class TargetManagerImpl(val userRequest: String?, val hostManager: Host
hostManager.targets.getValue(hostManager.known(resolvedAlias))
}
}
override val hostTargetSuffix get() = hostTargetSuffix(HostManager.host, target)
override val targetSuffix get() = target.name
}
fun hostTargetSuffix(host: KonanTarget, target: KonanTarget) =