Change default module name from project.name to archivesBaseName;

Get rid of `_main` for the main module.

Issue #KT-17355 Fixed
This commit is contained in:
Sergey Igushkin
2017-08-04 19:30:54 +03:00
parent 239943867b
commit 84e1e9f8aa
2 changed files with 31 additions and 1 deletions
@@ -20,6 +20,7 @@ import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.api.file.SourceDirectorySet
import org.gradle.api.logging.Logger
import org.gradle.api.plugins.BasePluginConvention
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.SourceTask
import org.gradle.api.tasks.TaskAction
@@ -132,7 +133,12 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments>() : AbstractKo
internal var javaOutputDir: File? = null
internal var sourceSetName: String by Delegates.notNull()
internal val moduleName: String
get() = "${project.name}_$sourceSetName"
get() {
val baseName = project.convention.findPlugin(BasePluginConvention::class.java)?.archivesBaseName
?: project.name
val suffix = if (sourceSetName == "main") "" else "_$sourceSetName"
return "$baseName$suffix"
}
@Suppress("UNCHECKED_CAST")
protected val friendTask: AbstractKotlinCompile<T>?