diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPDataNodes.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPDataNodes.kt index 4e5104918dd..e797a70c296 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPDataNodes.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPDataNodes.kt @@ -39,7 +39,10 @@ class KotlinSourceSetInfo @PropertyMapping("kotlinModule") constructor(val kotli val platform: KotlinPlatform get() = actualPlatforms.getSinglePlatform() + @Transient var defaultCompilerArguments: CommonCompilerArguments? = null + + @Transient var compilerArguments: CommonCompilerArguments? = null var dependencyClasspath: List = emptyList() var isTestModule: Boolean = false diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt index 4cc0bcd7ebe..c5ccd076550 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt @@ -46,6 +46,7 @@ import org.jetbrains.plugins.gradle.service.project.GradleProjectResolverUtil.ge import org.jetbrains.plugins.gradle.service.project.ProjectResolverContext import org.jetbrains.plugins.gradle.util.GradleConstants import java.io.File +import java.lang.reflect.Proxy import java.util.* import kotlin.collections.HashMap @@ -750,6 +751,13 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() { resolverCtx: ProjectResolverContext ): KotlinSourceSetInfo? { if (compilation.platform.isNotSupported()) return null + if (Proxy.isProxyClass(compilation.javaClass)) { + return createSourceSetInfo( + KotlinCompilationImpl(compilation, HashMap()), + gradleModule, + resolverCtx + ) + } return KotlinSourceSetInfo(compilation).also { sourceSetInfo -> sourceSetInfo.moduleId = getKotlinModuleId(gradleModule, compilation, resolverCtx) sourceSetInfo.gradleModuleId = getModuleId(resolverCtx, gradleModule)