Fix serialization of data nodes tree
#KT-33987 Fixed
This commit is contained in:
@@ -39,7 +39,10 @@ class KotlinSourceSetInfo @PropertyMapping("kotlinModule") constructor(val kotli
|
|||||||
val platform: KotlinPlatform
|
val platform: KotlinPlatform
|
||||||
get() = actualPlatforms.getSinglePlatform()
|
get() = actualPlatforms.getSinglePlatform()
|
||||||
|
|
||||||
|
@Transient
|
||||||
var defaultCompilerArguments: CommonCompilerArguments? = null
|
var defaultCompilerArguments: CommonCompilerArguments? = null
|
||||||
|
|
||||||
|
@Transient
|
||||||
var compilerArguments: CommonCompilerArguments? = null
|
var compilerArguments: CommonCompilerArguments? = null
|
||||||
var dependencyClasspath: List<String> = emptyList()
|
var dependencyClasspath: List<String> = emptyList()
|
||||||
var isTestModule: Boolean = false
|
var isTestModule: Boolean = false
|
||||||
|
|||||||
+8
@@ -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.service.project.ProjectResolverContext
|
||||||
import org.jetbrains.plugins.gradle.util.GradleConstants
|
import org.jetbrains.plugins.gradle.util.GradleConstants
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
import java.lang.reflect.Proxy
|
||||||
import java.util.*
|
import java.util.*
|
||||||
import kotlin.collections.HashMap
|
import kotlin.collections.HashMap
|
||||||
|
|
||||||
@@ -750,6 +751,13 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
|
|||||||
resolverCtx: ProjectResolverContext
|
resolverCtx: ProjectResolverContext
|
||||||
): KotlinSourceSetInfo? {
|
): KotlinSourceSetInfo? {
|
||||||
if (compilation.platform.isNotSupported()) return null
|
if (compilation.platform.isNotSupported()) return null
|
||||||
|
if (Proxy.isProxyClass(compilation.javaClass)) {
|
||||||
|
return createSourceSetInfo(
|
||||||
|
KotlinCompilationImpl(compilation, HashMap<Any, Any>()),
|
||||||
|
gradleModule,
|
||||||
|
resolverCtx
|
||||||
|
)
|
||||||
|
}
|
||||||
return KotlinSourceSetInfo(compilation).also { sourceSetInfo ->
|
return KotlinSourceSetInfo(compilation).also { sourceSetInfo ->
|
||||||
sourceSetInfo.moduleId = getKotlinModuleId(gradleModule, compilation, resolverCtx)
|
sourceSetInfo.moduleId = getKotlinModuleId(gradleModule, compilation, resolverCtx)
|
||||||
sourceSetInfo.gradleModuleId = getModuleId(resolverCtx, gradleModule)
|
sourceSetInfo.gradleModuleId = getModuleId(resolverCtx, gradleModule)
|
||||||
|
|||||||
Reference in New Issue
Block a user