add kotlinTarget field to non-mpp kotlin gradle model

This commit is contained in:
Vadim Brilyantov
2018-12-26 19:46:36 +03:00
parent 7e41384a60
commit 6d8439e9fb
2 changed files with 6 additions and 3 deletions
@@ -219,7 +219,7 @@ class KotlinGradleProjectResolverExtension : AbstractProjectResolverExtension()
KotlinStatisticsTrigger.trigger( KotlinStatisticsTrigger.trigger(
KotlinTargetTrigger::class.java, KotlinTargetTrigger::class.java,
gradleModel.platformPluginId ?: "unknown" gradleModel.kotlinTarget ?: "unknown"
) )
addImplementedModuleNames(gradleModule, ideModule, ideProject, gradleModel) addImplementedModuleNames(gradleModule, ideModule, ideProject, gradleModel)
@@ -48,6 +48,7 @@ interface KotlinGradleModel : Serializable {
val coroutines: String? val coroutines: String?
val platformPluginId: String? val platformPluginId: String?
val implements: List<String> val implements: List<String>
val kotlinTarget: String?
} }
class KotlinGradleModelImpl( class KotlinGradleModelImpl(
@@ -55,7 +56,8 @@ class KotlinGradleModelImpl(
override val compilerArgumentsBySourceSet: CompilerArgumentsBySourceSet, override val compilerArgumentsBySourceSet: CompilerArgumentsBySourceSet,
override val coroutines: String?, override val coroutines: String?,
override val platformPluginId: String?, override val platformPluginId: String?,
override val implements: List<String> override val implements: List<String>,
override val kotlinTarget: String? = null
) : KotlinGradleModel ) : KotlinGradleModel
abstract class AbstractKotlinGradleModelBuilder : ModelBuilderService { abstract class AbstractKotlinGradleModelBuilder : ModelBuilderService {
@@ -170,7 +172,8 @@ class KotlinGradleModelBuilder : AbstractKotlinGradleModelBuilder() {
compilerArgumentsBySourceSet, compilerArgumentsBySourceSet,
getCoroutines(project), getCoroutines(project),
platform, platform,
implementedProjects.map { it.pathOrName() } implementedProjects.map { it.pathOrName() },
platform ?: kotlinPluginId
) )
} }
} }