azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MPP: Add all android-targeted compilation source roots to the module

Browse Source
This commit is contained in:
Alexey Sedunov
2018-09-20 18:54:08 +03:00
parent 3a973973ce
commit 4f01a438c4
5 changed files with 90 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt
+18 -13
View File
@@ -63,19 +63,25 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
val moduleData = nodeToImport.data val moduleData = nodeToImport.data
val module = modelsProvider.findIdeModule(moduleData) ?: continue val module = modelsProvider.findIdeModule(moduleData) ?: continue
val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module) val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
val rootModel = modelsProvider.getModifiableRootModel(module)
for (sourceSetInfo in nodeToImport.kotlinAndroidSourceSets ?: emptyList()) {
val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
for (sourceSet in compilation.sourceSets) {
if (sourceSet.platform == KotlinPlatform.ANDROID) {
val sourceType = if (sourceSet.isTestModule) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
val resourceType = if (sourceSet.isTestModule) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
sourceSet.sourceDirs.forEach { addSourceRoot(it, sourceType, rootModel, shouldCreateEmptySourceRoots) }
sourceSet.resourceDirs.forEach { addSourceRoot(it, resourceType, rootModel, shouldCreateEmptySourceRoots) }
}
}
}
val androidModel = AndroidModuleModel.get(module) ?: continue val androidModel = AndroidModuleModel.get(module) ?: continue
val variantName = androidModel.selectedVariant.name val variantName = androidModel.selectedVariant.name
val sourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue val mainSourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue
val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue val mainCompilation = mainSourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
val rootModel = modelsProvider.getModifiableRootModel(module) for (sourceSet in mainCompilation.sourceSets) {
for (sourceSet in compilation.sourceSets) { if (sourceSet.platform != KotlinPlatform.ANDROID) {
if (sourceSet.platform == KotlinPlatform.ANDROID) { val sourceSetId = mainSourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
val sourceType = if (sourceSet.isTestModule) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
val resourceType = if (sourceSet.isTestModule) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
sourceSet.sourceDirs.forEach { addSourceRoot(it, sourceType, rootModel, shouldCreateEmptySourceRoots) }
sourceSet.resourceDirs.forEach { addSourceRoot(it, resourceType, rootModel, shouldCreateEmptySourceRoots) }
} else {
val sourceSetId = sourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) { val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) {
(it.data as? ModuleData)?.id == sourceSetId (it.data as? ModuleData)?.id == sourceSetId
}?.data as? ModuleData ?: continue }?.data as? ModuleData ?: continue
@@ -83,8 +89,7 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
rootModel.addModuleOrderEntry(sourceSetModule) rootModel.addModuleOrderEntry(sourceSetModule)
} }
} }
KotlinSourceSetDataService.configureFacet(moduleData, mainSourceSetInfo, nodeToImport, module, modelsProvider)
KotlinSourceSetDataService.configureFacet(moduleData, sourceSetInfo, nodeToImport, module, modelsProvider)
val kotlinFacet = KotlinFacet.get(module) val kotlinFacet = KotlinFacet.get(module)
if (kotlinFacet != null) { if (kotlinFacet != null) {
idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.173
+18 -13
View File
@@ -62,19 +62,25 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
val moduleData = nodeToImport.data val moduleData = nodeToImport.data
val module = modelsProvider.findIdeModule(moduleData) ?: continue val module = modelsProvider.findIdeModule(moduleData) ?: continue
val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module) val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
val rootModel = modelsProvider.getModifiableRootModel(module)
for (sourceSetInfo in nodeToImport.kotlinAndroidSourceSets ?: emptyList()) {
val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
for (sourceSet in compilation.sourceSets) {
if (sourceSet.platform == KotlinPlatform.ANDROID) {
val sourceType = if (sourceSet.isTestModule) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
val resourceType = if (sourceSet.isTestModule) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
sourceSet.sourceDirs.forEach { addSourceRoot(it, sourceType, rootModel, shouldCreateEmptySourceRoots) }
sourceSet.resourceDirs.forEach { addSourceRoot(it, resourceType, rootModel, shouldCreateEmptySourceRoots) }
}
}
}
val androidModel = AndroidModuleModel.get(module) ?: continue val androidModel = AndroidModuleModel.get(module) ?: continue
val variantName = androidModel.selectedVariant.name val variantName = androidModel.selectedVariant.name
val sourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue val mainSourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue
val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue val mainCompilation = mainSourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
val rootModel = modelsProvider.getModifiableRootModel(module) for (sourceSet in mainCompilation.sourceSets) {
for (sourceSet in compilation.sourceSets) { if (sourceSet.platform != KotlinPlatform.ANDROID) {
if (sourceSet.platform == KotlinPlatform.ANDROID) { val sourceSetId = mainSourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
val sourceType = if (sourceSet.isTestModule) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
val resourceType = if (sourceSet.isTestModule) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
sourceSet.sourceDirs.forEach { addSourceRoot(it, sourceType, rootModel, shouldCreateEmptySourceRoots) }
sourceSet.resourceDirs.forEach { addSourceRoot(it, resourceType, rootModel, shouldCreateEmptySourceRoots) }
} else {
val sourceSetId = sourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) { val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) {
(it.data as? ModuleData)?.id == sourceSetId (it.data as? ModuleData)?.id == sourceSetId
}?.data as? ModuleData ?: continue }?.data as? ModuleData ?: continue
@@ -82,8 +88,7 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
rootModel.addModuleOrderEntry(sourceSetModule) rootModel.addModuleOrderEntry(sourceSetModule)
} }
} }
KotlinSourceSetDataService.configureFacet(moduleData, mainSourceSetInfo, nodeToImport, module, modelsProvider)
KotlinSourceSetDataService.configureFacet(moduleData, sourceSetInfo, nodeToImport, module, modelsProvider)
val kotlinFacet = KotlinFacet.get(module) val kotlinFacet = KotlinFacet.get(module)
if (kotlinFacet != null) { if (kotlinFacet != null) {
idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.181
+18 -13
View File
@@ -63,19 +63,25 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
val moduleData = nodeToImport.data val moduleData = nodeToImport.data
val module = modelsProvider.findIdeModule(moduleData) ?: continue val module = modelsProvider.findIdeModule(moduleData) ?: continue
val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module) val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
val rootModel = modelsProvider.getModifiableRootModel(module)
for (sourceSetInfo in nodeToImport.kotlinAndroidSourceSets ?: emptyList()) {
val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
for (sourceSet in compilation.sourceSets) {
if (sourceSet.platform == KotlinPlatform.ANDROID) {
val sourceType = if (sourceSet.isTestModule) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
val resourceType = if (sourceSet.isTestModule) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
sourceSet.sourceDirs.forEach { addSourceRoot(it, sourceType, rootModel, shouldCreateEmptySourceRoots) }
sourceSet.resourceDirs.forEach { addSourceRoot(it, resourceType, rootModel, shouldCreateEmptySourceRoots) }
}
}
}
val androidModel = AndroidModuleModel.get(module) ?: continue val androidModel = AndroidModuleModel.get(module) ?: continue
val variantName = androidModel.selectedVariant.name val variantName = androidModel.selectedVariant.name
val sourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue val mainSourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue
val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue val mainCompilation = mainSourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
val rootModel = modelsProvider.getModifiableRootModel(module) for (sourceSet in mainCompilation.sourceSets) {
for (sourceSet in compilation.sourceSets) { if (sourceSet.platform != KotlinPlatform.ANDROID) {
if (sourceSet.platform == KotlinPlatform.ANDROID) { val sourceSetId = mainSourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
val sourceType = if (sourceSet.isTestModule) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
val resourceType = if (sourceSet.isTestModule) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
sourceSet.sourceDirs.forEach { addSourceRoot(it, sourceType, rootModel, shouldCreateEmptySourceRoots) }
sourceSet.resourceDirs.forEach { addSourceRoot(it, resourceType, rootModel, shouldCreateEmptySourceRoots) }
} else {
val sourceSetId = sourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) { val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) {
(it.data as? ModuleData)?.id == sourceSetId (it.data as? ModuleData)?.id == sourceSetId
}?.data as? ModuleData ?: continue }?.data as? ModuleData ?: continue
@@ -83,8 +89,7 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
rootModel.addModuleOrderEntry(sourceSetModule) rootModel.addModuleOrderEntry(sourceSetModule)
} }
} }
KotlinSourceSetDataService.configureFacet(moduleData, mainSourceSetInfo, nodeToImport, module, modelsProvider)
KotlinSourceSetDataService.configureFacet(moduleData, sourceSetInfo, nodeToImport, module, modelsProvider)
val kotlinFacet = KotlinFacet.get(module) val kotlinFacet = KotlinFacet.get(module)
if (kotlinFacet != null) { if (kotlinFacet != null) {
idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.as31
+18 -13
View File
@@ -76,19 +76,25 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
val moduleData = nodeToImport.data val moduleData = nodeToImport.data
val module = modelsProvider.findIdeModule(moduleData) ?: continue val module = modelsProvider.findIdeModule(moduleData) ?: continue
val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module) val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
val rootModel = modelsProvider.getModifiableRootModel(module)
for (sourceSetInfo in nodeToImport.kotlinAndroidSourceSets ?: emptyList()) {
val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
for (sourceSet in compilation.sourceSets) {
if (sourceSet.platform == KotlinPlatform.ANDROID) {
val sourceType = if (sourceSet.isTestModule) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
val resourceType = if (sourceSet.isTestModule) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
sourceSet.sourceDirs.forEach { addSourceRoot(it, sourceType, rootModel, shouldCreateEmptySourceRoots) }
sourceSet.resourceDirs.forEach { addSourceRoot(it, resourceType, rootModel, shouldCreateEmptySourceRoots) }
}
}
}
val androidModel = AndroidModuleModel.get(module) ?: continue val androidModel = AndroidModuleModel.get(module) ?: continue
val variantName = androidModel.selectedVariant.name val variantName = androidModel.selectedVariant.name
val sourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue val mainSourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue
val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue val mainCompilation = mainSourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
val rootModel = modelsProvider.getModifiableRootModel(module) for (sourceSet in mainCompilation.sourceSets) {
for (sourceSet in compilation.sourceSets) { if (sourceSet.platform != KotlinPlatform.ANDROID) {
if (sourceSet.platform == KotlinPlatform.ANDROID) { val sourceSetId = mainSourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
val sourceType = if (sourceSet.isTestModule) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
val resourceType = if (sourceSet.isTestModule) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
sourceSet.sourceDirs.forEach { addSourceRoot(it, sourceType, rootModel, shouldCreateEmptySourceRoots) }
sourceSet.resourceDirs.forEach { addSourceRoot(it, resourceType, rootModel, shouldCreateEmptySourceRoots) }
} else {
val sourceSetId = sourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) { val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) {
(it.data as? ModuleData)?.id == sourceSetId (it.data as? ModuleData)?.id == sourceSetId
}?.data as? ModuleData ?: continue }?.data as? ModuleData ?: continue
@@ -96,8 +102,7 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
rootModel.addModuleOrderEntry(sourceSetModule) rootModel.addModuleOrderEntry(sourceSetModule)
} }
} }
KotlinSourceSetDataService.configureFacet(moduleData, mainSourceSetInfo, nodeToImport, module, modelsProvider)
KotlinSourceSetDataService.configureFacet(moduleData, sourceSetInfo, nodeToImport, module, modelsProvider)
val kotlinFacet = KotlinFacet.get(module) val kotlinFacet = KotlinFacet.get(module)
if (kotlinFacet != null) { if (kotlinFacet != null) {
idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.as32
+18 -13
View File
@@ -63,19 +63,25 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
val moduleData = nodeToImport.data val moduleData = nodeToImport.data
val module = modelsProvider.findIdeModule(moduleData) ?: continue val module = modelsProvider.findIdeModule(moduleData) ?: continue
val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module) val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
val rootModel = modelsProvider.getModifiableRootModel(module)
for (sourceSetInfo in nodeToImport.kotlinAndroidSourceSets ?: emptyList()) {
val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
for (sourceSet in compilation.sourceSets) {
if (sourceSet.platform == KotlinPlatform.ANDROID) {
val sourceType = if (sourceSet.isTestModule) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
val resourceType = if (sourceSet.isTestModule) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
sourceSet.sourceDirs.forEach { addSourceRoot(it, sourceType, rootModel, shouldCreateEmptySourceRoots) }
sourceSet.resourceDirs.forEach { addSourceRoot(it, resourceType, rootModel, shouldCreateEmptySourceRoots) }
}
}
}
val androidModel = AndroidModuleModel.get(module) ?: continue val androidModel = AndroidModuleModel.get(module) ?: continue
val variantName = androidModel.selectedVariant.name val variantName = androidModel.selectedVariant.name
val sourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue val mainSourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue
val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue val mainCompilation = mainSourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
val rootModel = modelsProvider.getModifiableRootModel(module) for (sourceSet in mainCompilation.sourceSets) {
for (sourceSet in compilation.sourceSets) { if (sourceSet.platform != KotlinPlatform.ANDROID) {
if (sourceSet.platform == KotlinPlatform.ANDROID) { val sourceSetId = mainSourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
val sourceType = if (sourceSet.isTestModule) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
val resourceType = if (sourceSet.isTestModule) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
sourceSet.sourceDirs.forEach { addSourceRoot(it, sourceType, rootModel, shouldCreateEmptySourceRoots) }
sourceSet.resourceDirs.forEach { addSourceRoot(it, resourceType, rootModel, shouldCreateEmptySourceRoots) }
} else {
val sourceSetId = sourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) { val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) {
(it.data as? ModuleData)?.id == sourceSetId (it.data as? ModuleData)?.id == sourceSetId
}?.data as? ModuleData ?: continue }?.data as? ModuleData ?: continue
@@ -83,8 +89,7 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
rootModel.addModuleOrderEntry(sourceSetModule) rootModel.addModuleOrderEntry(sourceSetModule)
} }
} }
KotlinSourceSetDataService.configureFacet(moduleData, mainSourceSetInfo, nodeToImport, module, modelsProvider)
KotlinSourceSetDataService.configureFacet(moduleData, sourceSetInfo, nodeToImport, module, modelsProvider)
val kotlinFacet = KotlinFacet.get(module) val kotlinFacet = KotlinFacet.get(module)
if (kotlinFacet != null) { if (kotlinFacet != null) {