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

MPP: Enable Android-specific content root logic for Android Studio

Browse Source 
#KT-26813 Fixed
This commit is contained in:
Alexey Sedunov
2018-09-14 20:29:06 +03:00
parent 082c44cb5c
commit 7b3973db52
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidMPPGradleProjectResolver.kt
+2 -1
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.android.configure
import com.android.builder.model.AndroidProject import com.android.builder.model.AndroidProject
import com.android.builder.model.NativeAndroidProject import com.android.builder.model.NativeAndroidProject
import com.android.tools.idea.IdeInfo
import com.android.tools.idea.gradle.project.sync.idea.data.model.ImportedModule import com.android.tools.idea.gradle.project.sync.idea.data.model.ImportedModule
import com.android.tools.idea.gradle.project.sync.idea.data.service.AndroidProjectKeys.IMPORTED_MODULE import com.android.tools.idea.gradle.project.sync.idea.data.service.AndroidProjectKeys.IMPORTED_MODULE
import com.intellij.openapi.externalSystem.model.DataNode import com.intellij.openapi.externalSystem.model.DataNode
@@ -48,7 +49,7 @@ class KotlinAndroidMPPGradleProjectResolver : AbstractProjectResolverExtension()
override fun populateModuleContentRoots(gradleModule: IdeaModule, ideModule: DataNode<ModuleData>) { override fun populateModuleContentRoots(gradleModule: IdeaModule, ideModule: DataNode<ModuleData>) {
super.populateModuleContentRoots(gradleModule, ideModule) super.populateModuleContentRoots(gradleModule, ideModule)
if (isAndroidProject) { if (IdeInfo.getInstance().isAndroidStudio || isAndroidProject) {
KotlinMPPGradleProjectResolver.populateContentRoots(gradleModule, ideModule, resolverCtx) KotlinMPPGradleProjectResolver.populateContentRoots(gradleModule, ideModule, resolverCtx)
// Work around module disposal service which discards modules without accompanying ImportedModule instance // Work around module disposal service which discards modules without accompanying ImportedModule instance
for (childNode in ExternalSystemApiUtil.getChildren(ideModule, GradleSourceSetData.KEY)) { for (childNode in ExternalSystemApiUtil.getChildren(ideModule, GradleSourceSetData.KEY)) {
idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidMPPGradleProjectResolver.kt.173
+2 -1
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.android.configure
import com.android.builder.model.AndroidProject import com.android.builder.model.AndroidProject
import com.android.builder.model.NativeAndroidProject import com.android.builder.model.NativeAndroidProject
import com.android.tools.idea.IdeInfo
import com.android.tools.idea.gradle.ImportedModule import com.android.tools.idea.gradle.ImportedModule
import com.android.tools.idea.gradle.project.sync.idea.data.service.AndroidProjectKeys.IMPORTED_MODULE import com.android.tools.idea.gradle.project.sync.idea.data.service.AndroidProjectKeys.IMPORTED_MODULE
import com.intellij.openapi.externalSystem.model.DataNode import com.intellij.openapi.externalSystem.model.DataNode
@@ -48,7 +49,7 @@ class KotlinAndroidMPPGradleProjectResolver : AbstractProjectResolverExtension()
override fun populateModuleContentRoots(gradleModule: IdeaModule, ideModule: DataNode<ModuleData>) { override fun populateModuleContentRoots(gradleModule: IdeaModule, ideModule: DataNode<ModuleData>) {
super.populateModuleContentRoots(gradleModule, ideModule) super.populateModuleContentRoots(gradleModule, ideModule)
if (isAndroidProject) { if (IdeInfo.getInstance().isAndroidStudio || isAndroidProject) {
KotlinMPPGradleProjectResolver.populateContentRoots(gradleModule, ideModule, resolverCtx) KotlinMPPGradleProjectResolver.populateContentRoots(gradleModule, ideModule, resolverCtx)
// Work around module disposal service which discards modules without accompanying ImportedModule instance // Work around module disposal service which discards modules without accompanying ImportedModule instance
for (childNode in ExternalSystemApiUtil.getChildren(ideModule, GradleSourceSetData.KEY)) { for (childNode in ExternalSystemApiUtil.getChildren(ideModule, GradleSourceSetData.KEY)) {
idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidMPPGradleProjectResolver.kt.as31
+2 -1
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.android.configure
import com.android.builder.model.AndroidProject import com.android.builder.model.AndroidProject
import com.android.builder.model.NativeAndroidProject import com.android.builder.model.NativeAndroidProject
import com.android.tools.idea.IdeInfo
import com.android.tools.idea.gradle.project.sync.idea.data.model.ImportedModule import com.android.tools.idea.gradle.project.sync.idea.data.model.ImportedModule
import com.android.tools.idea.gradle.project.sync.idea.data.service.AndroidProjectKeys.IMPORTED_MODULE import com.android.tools.idea.gradle.project.sync.idea.data.service.AndroidProjectKeys.IMPORTED_MODULE
import com.intellij.openapi.externalSystem.model.DataNode import com.intellij.openapi.externalSystem.model.DataNode
@@ -48,7 +49,7 @@ class KotlinAndroidMPPGradleProjectResolver : AbstractProjectResolverExtension()
override fun populateModuleContentRoots(gradleModule: IdeaModule, ideModule: DataNode<ModuleData>) { override fun populateModuleContentRoots(gradleModule: IdeaModule, ideModule: DataNode<ModuleData>) {
super.populateModuleContentRoots(gradleModule, ideModule) super.populateModuleContentRoots(gradleModule, ideModule)
if (isAndroidProject) { if (IdeInfo.getInstance().isAndroidStudio || isAndroidProject) {
KotlinMPPGradleProjectResolver.populateContentRoots(gradleModule, ideModule, resolverCtx) KotlinMPPGradleProjectResolver.populateContentRoots(gradleModule, ideModule, resolverCtx)
// Work around module disposal service which discards modules without accompanying ImportedModule instance // Work around module disposal service which discards modules without accompanying ImportedModule instance
for (childNode in ExternalSystemApiUtil.getChildren(ideModule, GradleSourceSetData.KEY)) { for (childNode in ExternalSystemApiUtil.getChildren(ideModule, GradleSourceSetData.KEY)) {