Rename platform to targetPlatform in KotlinFacetSettings to avoid ambiguity in Java
This commit is contained in:
+1
-1
@@ -469,7 +469,7 @@ abstract class AbstractIncrementalJpsTest(
|
||||
|
||||
private fun configureRequiredLibraries() {
|
||||
myProject.modules.forEach { module ->
|
||||
val platformKind = module.kotlinFacet?.settings?.platform?.idePlatformKind.orDefault()
|
||||
val platformKind = module.kotlinFacet?.settings?.targetPlatform?.idePlatformKind.orDefault()
|
||||
|
||||
when {
|
||||
platformKind.isJvm -> {
|
||||
|
||||
+2
-4
@@ -16,8 +16,6 @@ import org.jetbrains.kotlin.config.KotlinModuleKind.COMPILATION_AND_SOURCE_SET_H
|
||||
import org.jetbrains.kotlin.config.KotlinModuleKind.SOURCE_SET_HOLDER
|
||||
import org.jetbrains.kotlin.jps.build.dependeciestxt.ModulesTxt.Dependency.Kind.*
|
||||
import org.jetbrains.kotlin.platform.impl.FakeK2NativeCompilerArguments
|
||||
import org.jetbrains.kotlin.platform.impl.isCommon
|
||||
import org.jetbrains.kotlin.platform.impl.isJvm
|
||||
import org.jetbrains.kotlin.platform.isCommon
|
||||
import org.jetbrains.kotlin.platform.jvm.isJvm
|
||||
import java.io.File
|
||||
@@ -54,11 +52,11 @@ data class ModulesTxt(
|
||||
|
||||
val isCommonModule
|
||||
get() =
|
||||
kotlinFacetSettings?.platform.isCommon() ||
|
||||
kotlinFacetSettings?.targetPlatform.isCommon() ||
|
||||
kotlinFacetSettings?.kind == SOURCE_SET_HOLDER
|
||||
|
||||
val isJvmModule
|
||||
get() = kotlinFacetSettings?.platform.isJvm()
|
||||
get() = kotlinFacetSettings?.targetPlatform.isJvm()
|
||||
|
||||
val expectedBy
|
||||
get() = dependencies.filter {
|
||||
|
||||
@@ -17,7 +17,7 @@ val JpsModule.kotlinFacet: JpsKotlinFacetModuleExtension?
|
||||
get() = container.getChild(JpsKotlinFacetModuleExtension.KIND)
|
||||
|
||||
val JpsModule.platform: TargetPlatform?
|
||||
get() = kotlinFacet?.settings?.platform
|
||||
get() = kotlinFacet?.settings?.targetPlatform
|
||||
|
||||
val JpsModule.kotlinKind: KotlinModuleKind
|
||||
get() = kotlinFacet?.settings?.kind ?: KotlinModuleKind.DEFAULT
|
||||
|
||||
Reference in New Issue
Block a user