From 2cd5bfe015208c1b8d31f34c20502f1c09799268 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Mon, 18 Dec 2017 12:20:55 +0700 Subject: [PATCH] Fix typos and remove some TODOs --- PLATFORM_LIBS.md | 2 +- build.gradle | 2 +- samples/build.gradle | 2 +- .../org/jetbrains/kotlin/konan/util/DependencyProcessor.kt | 3 --- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/PLATFORM_LIBS.md b/PLATFORM_LIBS.md index c171dbad414..ca24e15a7e1 100644 --- a/PLATFORM_LIBS.md +++ b/PLATFORM_LIBS.md @@ -51,7 +51,7 @@ Inspect the contents of `dist/klib/platform/$target` of the distribution for the ## Availability by default -The packages from platfrom libraries are available by default. No +The packages from platform libraries are available by default. No special link flags need to be specified to use them. `Kotlin/Native` compiler automatically detects which of the platform libraries have been accessed and automatically links the needed libraries. diff --git a/build.gradle b/build.gradle index a7505d88814..64511fa72d3 100644 --- a/build.gradle +++ b/build.gradle @@ -297,7 +297,7 @@ targetList.each { target -> targetDefFiles(target).forEach{ defFile -> def taskName = defFileToTaskName(target, defFile.name) - def jvmArgs = project.findProperty("platfromLibsJvmArgs") ?: "-Xmx3G" + def jvmArgs = project.findProperty("platformLibsJvmArgs") ?: "-Xmx3G" def suffix = null if (new PlatformInfo().isWindows()) suffix = 'bat' diff --git a/samples/build.gradle b/samples/build.gradle index 54289451a9a..1ac3e7f9ec2 100644 --- a/samples/build.gradle +++ b/samples/build.gradle @@ -18,7 +18,7 @@ task buildSh(type: Exec) { workingDir projectDir.canonicalPath } -task buildSamplesWithPlatfromLibs() { +task buildSamplesWithPlatformLibs() { dependsOn ':csvparser:build' dependsOn ':nonBlockingEchoServer:build' dependsOn ':objc:build' diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt index 4bf8a1c7130..1f4a48d899a 100644 --- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt +++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt @@ -84,8 +84,6 @@ sealed class DependencySource { } } -// TODO: Try to use some dependency management system (Ivy?) -// TODO: Maybe rename. /** * Inspects [dependencies] and downloads all the missing ones into [dependenciesDirectory] from [dependenciesUrl]. * If [airplaneMode] is true will throw a RuntimeException instead of downloading. @@ -110,7 +108,6 @@ class DependencyProcessor(dependenciesRoot: File, var showInfo = true private var isInfoShown = false - // TOOO: Rename pause -> interval private val downloader = DependencyDownloader(maxAttempts, attemptIntervalMs, customProgressCallback) private val extractor = DependencyExtractor()