diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
index 4ed2d5800c3..400771fd81f 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
@@ -279,7 +279,6 @@ fun Task.dependsOnKonanBuildingTask(artifact: String, target: KonanTarget) {
 
 //endregion
 
-@JvmOverloads
 fun compileSwift(
     project: Project, target: KonanTarget, sources: List<String>, options: List<String>,
     output: Path
diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanBaseTasks.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanBaseTasks.kt
index 349b97b1c59..0ab5ddf2e28 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanBaseTasks.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanBaseTasks.kt
@@ -11,11 +11,8 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.Project
 import org.gradle.api.artifacts.*
 import org.gradle.api.attributes.Attribute
-import org.gradle.api.attributes.AttributeContainer
 import org.gradle.api.attributes.Usage
-import org.gradle.api.capabilities.Capability
 import org.gradle.api.internal.component.DefaultSoftwareComponentVariant
-import org.gradle.api.internal.component.UsageContext
 import org.gradle.api.internal.tasks.DefaultTaskDependency
 import org.gradle.api.tasks.*
 import org.gradle.language.cpp.CppBinary
@@ -24,7 +21,6 @@ import org.jetbrains.kotlin.gradle.plugin.experimental.internal.compatibleVarian
 import org.jetbrains.kotlin.gradle.plugin.konan.*
 import org.jetbrains.kotlin.konan.target.HostManager
 import org.jetbrains.kotlin.konan.target.KonanTarget
-import org.jetbrains.kotlin.gradle.plugin.konan.*
 import org.jetbrains.kotlin.gradle.plugin.konan.konanTargets
 import java.io.File
 import java.util.*
@@ -94,20 +90,18 @@ abstract class KonanArtifactTask: KonanTargetableTask(), KonanArtifactSpec {
             attribute(Attribute.of("org.gradle.native.kotlin.platform", String::class.java), target.name)
         }
 
-        val artifactNameWithoutSuffix = artifact.name.removeSuffix("$artifactSuffix")
+        val artifactNameWithoutSuffix = artifact.name.removeSuffix(artifactSuffix)
         project.pluginManager.withPlugin("maven-publish") {
             platformConfiguration.artifacts.add(object: PublishArtifact {
                 override fun getName(): String = artifactNameWithoutSuffix
                 override fun getExtension() = if (artifactSuffix.startsWith('.')) artifactSuffix.substring(1) else artifactSuffix
                 override fun getType() = artifactSuffix
-                override fun getClassifier():String? = target.name
+                override fun getClassifier(): String = target.name
                 override fun getFile() = artifact
                 override fun getDate() = Date(artifact.lastModified())
                 override fun getBuildDependencies(): TaskDependency =
                         DefaultTaskDependency().apply { add(this@KonanArtifactTask) }
             })
-            val objectFactory = project.objects
-            val linkUsage = objectFactory.named(Usage::class.java, Usage.NATIVE_LINK)
             val konanSoftwareComponent = config.mainVariant
             val variantName = "${artifactNameWithoutSuffix}_${target.name}"
             val context = DefaultSoftwareComponentVariant(
diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCacheTask.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCacheTask.kt
index 37e76825537..a4cd0d6ccd0 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCacheTask.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCacheTask.kt
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.library.uniqueName
 import org.jetbrains.kotlin.*
 import org.jetbrains.kotlin.util.Logger
 import java.io.File
+import java.util.*
 
 enum class KonanCacheKind(val outputKind: CompilerOutputKind) {
     STATIC(CompilerOutputKind.STATIC_CACHE),
@@ -105,7 +106,7 @@ abstract class KonanCacheTask : DefaultTask() {
         val args = mutableListOf(
             "-g",
             "-target", target,
-            "-produce", cacheKind.outputKind.name.toLowerCase(),
+            "-produce", cacheKind.outputKind.name.lowercase(Locale.getDefault()),
             "-Xadd-cache=${originalKlib.asFile.get().absolutePath}",
             "-Xcache-directory=${cacheDirectory.absolutePath}"
         )
diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCompileTask.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCompileTask.kt
index 0d4fa74d0f5..a24c7248304 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCompileTask.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCompileTask.kt
@@ -7,10 +7,12 @@ package org.jetbrains.kotlin.gradle.plugin.tasks
 
 import org.gradle.api.file.FileCollection
 import org.gradle.api.tasks.*
+import org.gradle.api.tasks.Optional
 import org.gradle.process.CommandLineArgumentProvider
 import org.jetbrains.kotlin.gradle.plugin.konan.*
 import org.jetbrains.kotlin.konan.target.CompilerOutputKind
 import java.io.File
+import java.util.*
 
 /**
  * A task compiling the target executable/library using Kotlin/Native compiler
@@ -141,7 +143,7 @@ abstract class KonanCompileTask: KonanBuildingTask(), KonanCompileSpec {
     /** Args passed to the compiler at the first stage of two-stage compilation (klib building). */
     protected fun buildFirstStageArgs(klibPath: String) = mutableListOf<String>().apply {
         addArg("-output", klibPath)
-        addArg("-produce", CompilerOutputKind.LIBRARY.name.toLowerCase())
+        addArg("-produce", CompilerOutputKind.LIBRARY.name.lowercase(Locale.getDefault()))
 
         addAll(buildCommonArgs())
 
@@ -156,7 +158,7 @@ abstract class KonanCompileTask: KonanBuildingTask(), KonanCompileSpec {
     /** Args passed to the compiler at the second stage of two-stage compilation (producing a final binary from the klib).  */
     protected fun buildSecondStageArgs(klibPath: String) = mutableListOf<String>().apply {
         addArg("-output", artifact.canonicalPath)
-        addArg("-produce", produce.name.toLowerCase())
+        addArg("-produce", produce.name.lowercase(Locale.getDefault()))
         addArgIfNotNull("-entry", entryPoint)
 
         addAll(buildCommonArgs())
@@ -205,7 +207,7 @@ abstract class KonanCompileTask: KonanBuildingTask(), KonanCompileSpec {
     /** Args passed to the compiler if the two-stage compilation is disabled. */
     fun buildSingleStageArgs() = mutableListOf<String>().apply {
         addArg("-output", artifact.canonicalPath)
-        addArg("-produce", produce.name.toLowerCase())
+        addArg("-produce", produce.name.lowercase(Locale.getDefault()))
         addArgIfNotNull("-entry", entryPoint)
 
         addAll(buildCommonArgs())