add kotlinTarget field to non-mpp kotlin gradle model
This commit is contained in:
+1
-1
@@ -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
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user