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

[DependencyProcessor] Minor code cleanup

Browse Source
This commit is contained in:
Sergey Bogolepov
2020-02-18 16:08:28 +07:00
committed by Sergey Bogolepov
parent eb486a6e45
commit 2d3766b519
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt
+11 -12
View File
@@ -85,21 +85,21 @@ sealed class DependencySource {
* If [airplaneMode] is true will throw a RuntimeException instead of downloading. * If [airplaneMode] is true will throw a RuntimeException instead of downloading.
*/ */
class DependencyProcessor(dependenciesRoot: File, class DependencyProcessor(dependenciesRoot: File,
val dependenciesUrl: String, private val dependenciesUrl: String,
dependencyToCandidates: Map<String, List<DependencySource>>, dependencyToCandidates: Map<String, List<DependencySource>>,
homeDependencyCache: File = defaultDependencyCacheDir, homeDependencyCache: File = defaultDependencyCacheDir,
val airplaneMode: Boolean = false, private val airplaneMode: Boolean = false,
maxAttempts: Int = DependencyDownloader.DEFAULT_MAX_ATTEMPTS, maxAttempts: Int = DependencyDownloader.DEFAULT_MAX_ATTEMPTS,
attemptIntervalMs: Long = DependencyDownloader.DEFAULT_ATTEMPT_INTERVAL_MS, attemptIntervalMs: Long = DependencyDownloader.DEFAULT_ATTEMPT_INTERVAL_MS,
customProgressCallback: ProgressCallback? = null, customProgressCallback: ProgressCallback? = null,
val keepUnstable: Boolean = true, private val keepUnstable: Boolean = true,
val deleteArchives: Boolean = true, private val deleteArchives: Boolean = true,
private val archiveType: ArchiveType = ArchiveType.systemDefault) { private val archiveType: ArchiveType = ArchiveType.systemDefault) {
val dependenciesDirectory = dependenciesRoot.apply { mkdirs() } private val dependenciesDirectory = dependenciesRoot.apply { mkdirs() }
val cacheDirectory = homeDependencyCache.apply { mkdirs() } private val cacheDirectory = homeDependencyCache.apply { mkdirs() }
val lockFile = File(cacheDirectory, ".lock").apply { if (!exists()) createNewFile() } private val lockFile = File(cacheDirectory, ".lock").apply { if (!exists()) createNewFile() }
var showInfo = true var showInfo = true
private var isInfoShown = false private var isInfoShown = false
@@ -283,15 +283,14 @@ class DependencyProcessor(dependenciesRoot: File,
} }
internal object InternalServer { internal object InternalServer {
private val host = "repo.labs.intellij.net" private const val host = "repo.labs.intellij.net"
val url = "https://$host/kotlin-native" const val url = "https://$host/kotlin-native"
private val internalDomain = "labs.intellij.net" private const val internalDomain = "labs.intellij.net"
val isAvailable: Boolean get() { val isAvailable: Boolean get() {
val envKey = "KONAN_USE_INTERNAL_SERVER" val envKey = "KONAN_USE_INTERNAL_SERVER"
val envValue = System.getenv(envKey) return when (val envValue = System.getenv(envKey)) {
return when (envValue) {
null, "0" -> false null, "0" -> false
"1" -> true "1" -> true
"auto" -> isAccessible "auto" -> isAccessible