[Gradle, Wasm] Add wasm platform kind
KTIJ-25583
This commit is contained in:
committed by
Space Team
parent
04cb217791
commit
bcefa1cd66
@@ -8,6 +8,7 @@ dependencies {
|
||||
api(project(":compiler:config"))
|
||||
api(project(":compiler:config.jvm"))
|
||||
api(project(":js:js.config"))
|
||||
api(project(":wasm:wasm.config"))
|
||||
api(project(":native:kotlin-native-utils"))
|
||||
api(project(":compiler:plugin-api"))
|
||||
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
|
||||
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.platform.jvm.JvmPlatforms.allJvmPlatforms
|
||||
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms.unspecifiedJvmPlatform
|
||||
import org.jetbrains.kotlin.platform.konan.NativePlatforms.allNativePlatforms
|
||||
import org.jetbrains.kotlin.platform.konan.NativePlatforms.unspecifiedNativePlatform
|
||||
import org.jetbrains.kotlin.platform.wasm.WasmPlatforms
|
||||
|
||||
@Suppress("DEPRECATION_ERROR")
|
||||
object CommonPlatforms {
|
||||
@@ -23,6 +24,7 @@ object CommonPlatforms {
|
||||
setOf(
|
||||
unspecifiedJvmPlatform.single(),
|
||||
defaultJsPlatform.single(),
|
||||
WasmPlatforms.Default.single(),
|
||||
unspecifiedNativePlatform.single()
|
||||
)
|
||||
), org.jetbrains.kotlin.analyzer.common.CommonPlatform {
|
||||
@@ -39,6 +41,7 @@ object CommonPlatforms {
|
||||
yieldAll(allJvmPlatforms)
|
||||
yieldAll(allNativePlatforms)
|
||||
yieldAll(allJsPlatforms)
|
||||
yield(WasmPlatforms.Default)
|
||||
|
||||
// TODO(dsavvinov): extensions points?
|
||||
}.toList()
|
||||
|
||||
@@ -98,7 +98,9 @@ private val DEFAULT_CLASH_RESOLVERS = listOf<PlatformExtensionsClashResolver<*>>
|
||||
|
||||
PlatformExtensionsClashResolver.FallbackToDefault(DynamicTypesSettings(), DynamicTypesSettings::class.java),
|
||||
|
||||
PlatformExtensionsClashResolver.FirstWins(AbsentDescriptorHandler::class.java)
|
||||
PlatformExtensionsClashResolver.FirstWins(AbsentDescriptorHandler::class.java),
|
||||
|
||||
PlatformDiagnosticSuppressorClashesResolver()
|
||||
)
|
||||
|
||||
fun StorageComponentContainer.configureDefaultCheckers() {
|
||||
|
||||
+2
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.test.directives
|
||||
|
||||
import org.jetbrains.kotlin.config.JvmTarget
|
||||
import org.jetbrains.kotlin.platform.TargetPlatform
|
||||
import org.jetbrains.kotlin.platform.WasmPlatform
|
||||
import org.jetbrains.kotlin.platform.js.JsPlatforms
|
||||
import org.jetbrains.kotlin.platform.jvm.JdkPlatform
|
||||
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
|
||||
@@ -19,6 +20,7 @@ enum class TargetPlatformEnum(val targetPlatform: TargetPlatform) {
|
||||
setOf(
|
||||
JdkPlatform(JvmTarget.DEFAULT),
|
||||
JsPlatforms.DefaultSimpleJsPlatform,
|
||||
WasmPlatform,
|
||||
NativePlatformUnspecifiedTarget
|
||||
)
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user