diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinSourceSetDataService.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinSourceSetDataService.kt index afe0fe88e620..2637fc208f13 100644 --- a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinSourceSetDataService.kt +++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinSourceSetDataService.kt @@ -33,7 +33,6 @@ import org.jetbrains.kotlin.idea.facet.getOrCreateFacet import org.jetbrains.kotlin.idea.facet.noVersionAutoAdvance import org.jetbrains.kotlin.idea.gradle.configuration.KotlinSourceSetInfo import org.jetbrains.kotlin.idea.gradle.configuration.findChildModuleById -import org.jetbrains.kotlin.idea.gradle.configuration.kotlinAndroidSourceSets import org.jetbrains.kotlin.idea.gradle.configuration.kotlinSourceSetData import org.jetbrains.kotlin.idea.gradleJava.migrateNonJvmSourceFolders import org.jetbrains.kotlin.idea.gradleJava.pathAsUrl @@ -206,31 +205,6 @@ class KotlinSourceSetDataService : AbstractProjectDataService, - ideModule: Module, - modelsProvider: IdeModifiableModelsProvider - ) { - // TODO Review this code after AS Chipmunk released and merged to master - // In https://android.googlesource.com/platform/tools/adt/idea/+/ab31cd294775b7914ddefbe417a828b5c18acc81%5E%21/#F1 - // creation of KotlinAndroidSourceSetData node was dropped, all tasks must be stored in corresponding KotlinSourceSetData nodes - val additionalRunTasks = mainModuleNode.kotlinAndroidSourceSets - ?.filter { it.isTestModule } - ?.flatMap { it.externalSystemRunTasks } - ?.toSet() - configureFacet( - moduleData, - kotlinSourceSet, - mainModuleNode, - ideModule, - modelsProvider, - enumValues().toList(), - additionalRunTasks - ) - } - fun configureFacet( moduleData: ModuleData, kotlinSourceSet: KotlinSourceSetInfo,