Model mapping: reorder setup, create the modules early
This is needed in order for the fragment locator to correctly locate the test module when the `commonTest` source set is created.
This commit is contained in:
+12
-7
@@ -77,6 +77,18 @@ class KotlinMultiplatformPlugin : Plugin<Project> {
|
|||||||
|
|
||||||
project.plugins.apply(JavaBasePlugin::class.java)
|
project.plugins.apply(JavaBasePlugin::class.java)
|
||||||
|
|
||||||
|
if (project.hasKpmModel) {
|
||||||
|
setupFragmentsMetadataForKpmModules(project)
|
||||||
|
setupKpmModulesPublication(project)
|
||||||
|
registerDefaultVariantFactories(project)
|
||||||
|
with(project.kpmModules) {
|
||||||
|
create(KotlinGradleModule.MAIN_MODULE_NAME) {
|
||||||
|
it.makePublic()
|
||||||
|
}
|
||||||
|
create(KotlinGradleModule.TEST_MODULE_NAME)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
val targetsContainer = project.container(KotlinTarget::class.java)
|
val targetsContainer = project.container(KotlinTarget::class.java)
|
||||||
val kotlinMultiplatformExtension = project.extensions.getByType(KotlinMultiplatformExtension::class.java)
|
val kotlinMultiplatformExtension = project.extensions.getByType(KotlinMultiplatformExtension::class.java)
|
||||||
val targetsFromPreset = TargetFromPresetExtension(kotlinMultiplatformExtension)
|
val targetsFromPreset = TargetFromPresetExtension(kotlinMultiplatformExtension)
|
||||||
@@ -134,13 +146,6 @@ class KotlinMultiplatformPlugin : Plugin<Project> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (project.hasKpmModel) {
|
|
||||||
setupFragmentsMetadataForKpmModules(project)
|
|
||||||
setupKpmModulesPublication(project)
|
|
||||||
registerDefaultVariantFactories(project)
|
|
||||||
project.kpmModules.matching { it.name == KotlinGradleModule.MAIN_MODULE_NAME }.all { it.makePublic() }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun exportProjectStructureMetadataForOtherBuilds(
|
private fun exportProjectStructureMetadataForOtherBuilds(
|
||||||
|
|||||||
Reference in New Issue
Block a user