Renamed userName to visibleName.

tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanBuildingConfig.kt

@@ -36,7 +36,7 @@ abstract class KonanBuildingConfig<T: KonanBuildingTask>(private val name_: Stri
                                                          type: Class<T>,
                                                          val project: ProjectInternal,
                                                          instantiator: Instantiator)
-    : KonanBuildingSpec, Named, DefaultNamedDomainObjectSet<T>(type, instantiator, { it.konanTarget.userName }) {
+    : KonanBuildingSpec, Named, DefaultNamedDomainObjectSet<T>(type, instantiator, { it.konanTarget.visibleName }) {
 
     override fun getName() = name_
 
@@ -51,7 +51,7 @@ abstract class KonanBuildingConfig<T: KonanBuildingTask>(private val name_: Stri
             if (it.enabled) {
                 super.add(createTask(it))
             } else {
-                project.logger.warn("The target is not enabled on the current host: ${it.userName}")
+                project.logger.warn("The target is not enabled on the current host: ${it.visibleName}")
             }
         }
         aggregateBuildTask = createAggregateTask()
@@ -59,7 +59,7 @@ abstract class KonanBuildingConfig<T: KonanBuildingTask>(private val name_: Stri
     }
 
     protected open fun generateTaskName(target: KonanTarget) =
-            "compileKonan${name.capitalize()}${target.userName.capitalize()}"
+            "compileKonan${name.capitalize()}${target.visibleName.capitalize()}"
 
     protected open fun generateAggregateTaskName() =
             "compileKonan${name.capitalize()}"
@@ -85,7 +85,7 @@ abstract class KonanBuildingConfig<T: KonanBuildingTask>(private val name_: Stri
                 it.init(defaultBaseDir.targetSubdir(target), name, target)
                 it.group = BasePlugin.BUILD_GROUP
                 it.description = generateTaskDescription(it)
-            } ?: throw Exception("Cannot create task for target: ${target.userName}")
+            } ?: throw Exception("Cannot create task for target: ${target.visibleName}")
 
     protected fun createAggregateTask(): Task =
             project.tasks.create(generateAggregateTaskName()) { task ->
@@ -151,4 +151,4 @@ abstract class KonanBuildingConfig<T: KonanBuildingTask>(private val name_: Stri
             target(targetString) { configureAction.execute(this) }
     fun target(targetString: String, configureAction: Closure<Unit>) =
             target(targetString, ConfigureUtil.configureUsing(configureAction))
-}
+}

tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanLibrariesSpec.kt

@@ -69,7 +69,7 @@ open class KonanLibrariesSpec(val task: KonanArtifactWithLibrariesTask, val proj
         }
 
         val libraryTask = lib[target] ?:
-            throw InvalidUserDataException("Library ${lib.name} has no target ${target.userName}")
+            throw InvalidUserDataException("Library ${lib.name} has no target ${target.visibleName}")
 
         if (libraryTask == task) {
             throw InvalidUserDataException("Attempt to use a library as its own dependency: " +
@@ -128,4 +128,4 @@ open class KonanLibrariesSpec(val task: KonanArtifactWithLibrariesTask, val proj
     private fun Project.evaluationDependsOn(another: Project) {
         if (this != another) { evaluationDependsOn(another.path) }
     }
-}
+}

tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt

@@ -62,7 +62,7 @@ internal val Project.konanBinBaseDir         get() = konanBuildRoot.resolve("bin
 internal val Project.konanLibsBaseDir        get() = konanBuildRoot.resolve("libs")
 internal val Project.konanBitcodeBaseDir     get() = konanBuildRoot.resolve("bitcode")
 
-internal fun File.targetSubdir(target: KonanTarget) = resolve(target.userName)
+internal fun File.targetSubdir(target: KonanTarget) = resolve(target.visibleName)
 
 internal val Project.konanDefaultSrcFiles         get() = fileTree("${projectDir.canonicalPath}/src/main/kotlin")
 internal fun Project.konanDefaultDefFile(libName: String)
@@ -99,7 +99,7 @@ internal val Project.compileAllTask
 
 internal fun Project.targetIsRequested(target: KonanTarget): Boolean {
     val targets = requestedTargets
-    return (targets.isEmpty() || targets.contains(target.userName) || targets.contains("all"))
+    return (targets.isEmpty() || targets.contains(target.visibleName) || targets.contains("all"))
 }
 
 /** Looks for task with given name in the given project. Throws [UnknownTaskException] if there's not such task. */

tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanToolingModelBuilder.kt

@@ -27,7 +27,7 @@ object KonanToolingModelBuilder : ToolingModelBuilder {
     override fun buildAll(modelName: String, project: Project): KonanModel {
         val artifacts = project.konanArtifactsContainer.flatten()
                 .toList()
-                .map { KonanArtifactImpl("${it.artifact.name}-${it.konanTarget.userName}", it.artifact.canonicalPath) }
+                .map { KonanArtifactImpl("${it.artifact.name}-${it.konanTarget.visibleName}", it.artifact.canonicalPath) }
         return KonanModelImpl(project.konanVersion, artifacts)
     }
 }

tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanBaseTasks.kt

@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.konan.target.TargetManager
 import java.io.File
 
 internal val Project.host
-    get() = TargetManager.host.userName
+    get() = TargetManager.host.visibleName
 
 internal val Project.simpleOsName
     get() = TargetManager.simpleOsName()
@@ -54,7 +54,7 @@ abstract class KonanTargetableTask: DefaultTask() {
         @Internal get() = (konanTarget != TargetManager.host)
 
     val target: String
-        @Internal get() = konanTarget.userName
+        @Internal get() = konanTarget.visibleName
 }
 
 /** A task building an artifact. */

tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanCompileTask.kt

@@ -89,7 +89,7 @@ abstract class KonanCompileTask: KonanBuildingTask(), KonanCompileSpec {
 
         addListArg("-linkerOpts", linkerOpts)
 
-        addArgIfNotNull("-target", konanTarget.userName)
+        addArgIfNotNull("-target", konanTarget.visibleName)
         addArgIfNotNull("-language-version", languageVersion)
         addArgIfNotNull("-api-version", apiVersion)
         addArgIfNotNull("-entry", entryPoint)
@@ -190,4 +190,4 @@ open class KonanCompileLibraryTask: KonanCompileTask() {
 
 open class KonanCompileBitcodeTask: KonanCompileTask() {
     override val produce: Produce  get() = Produce.BITCODE
-}
+}

tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanCompilerDownloadTask.kt

@@ -75,7 +75,7 @@ open class KonanCompilerDownloadTask : DefaultTask() {
         if (downloadDependencies) {
             val runner = KonanCompilerRunner(project)
             project.konanExtension.konanTargets.forEach {
-                runner.run("--check_dependencies", "-target", it.userName)
+                runner.run("--check_dependencies", "-target", it.visibleName)
             }
         }
     }

tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanInteropTask.kt

@@ -62,7 +62,7 @@ open class KonanInteropTask: KonanBuildingTask(), KonanInteropSpec {
 
         addArg("-o", artifact.canonicalPath)
 
-        addArgIfNotNull("-target", konanTarget.userName)
+        addArgIfNotNull("-target", konanTarget.visibleName)
         addArgIfNotNull("-def", defFile.canonicalPath)
         addArgIfNotNull("-pkg", packageName)
 

tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/KonanProject.groovy

@@ -24,7 +24,7 @@ class KonanProject {
     static String DEFAULT_ARTIFACT_NAME = 'main'
     static String DEFAULT_INTEROP_NAME = "stdio"
 
-    static String HOST = TargetManager.host.userName
+    static String HOST = TargetManager.host.visibleName
 
     File projectDir
     Path projectPath
@@ -338,4 +338,4 @@ class KonanProject {
         return result
     }
 
-}
+}