[Wasm] Add kotlin wasm gradle attribute
This commit is contained in:
committed by
Space Team
parent
607d38f96f
commit
c6fdf1b3dd
+2
@@ -45,6 +45,7 @@ import org.jetbrains.kotlin.gradle.report.BuildMetricsService
|
|||||||
import org.jetbrains.kotlin.gradle.plugin.statistics.BuildFlowService
|
import org.jetbrains.kotlin.gradle.plugin.statistics.BuildFlowService
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsCompilerAttribute
|
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsCompilerAttribute
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsPlugin
|
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsPlugin
|
||||||
|
import org.jetbrains.kotlin.gradle.targets.js.KotlinWasmTargetAttribute
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.nodejs.DefaultUnameExecutorVariantFactory
|
import org.jetbrains.kotlin.gradle.targets.js.nodejs.DefaultUnameExecutorVariantFactory
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.nodejs.UnameExecutor
|
import org.jetbrains.kotlin.gradle.targets.js.nodejs.UnameExecutor
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.npm.addNpmDependencyExtension
|
import org.jetbrains.kotlin.gradle.targets.js.npm.addNpmDependencyExtension
|
||||||
@@ -198,6 +199,7 @@ abstract class DefaultKotlinBasePlugin : KotlinBasePlugin {
|
|||||||
KotlinPlatformType.setupAttributesMatchingStrategy(this)
|
KotlinPlatformType.setupAttributesMatchingStrategy(this)
|
||||||
KotlinUsages.setupAttributesMatchingStrategy(this, isKotlinGranularMetadata)
|
KotlinUsages.setupAttributesMatchingStrategy(this, isKotlinGranularMetadata)
|
||||||
KotlinJsCompilerAttribute.setupAttributesMatchingStrategy(project.dependencies.attributesSchema)
|
KotlinJsCompilerAttribute.setupAttributesMatchingStrategy(project.dependencies.attributesSchema)
|
||||||
|
KotlinWasmTargetAttribute.setupAttributesMatchingStrategy(project.dependencies.attributesSchema)
|
||||||
ProjectLocalConfigurations.setupAttributesMatchingStrategy(this)
|
ProjectLocalConfigurations.setupAttributesMatchingStrategy(this)
|
||||||
CInteropKlibLibraryElements.setupAttributesMatchingStrategy(this)
|
CInteropKlibLibraryElements.setupAttributesMatchingStrategy(this)
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-2
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.gradle.plugin.internal.artifactTypeAttribute
|
|||||||
import org.jetbrains.kotlin.gradle.plugin.mpp.*
|
import org.jetbrains.kotlin.gradle.plugin.mpp.*
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsCompilerAttribute
|
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsCompilerAttribute
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget
|
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget
|
||||||
|
import org.jetbrains.kotlin.gradle.targets.js.KotlinWasmTargetAttribute
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget
|
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget
|
||||||
import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
|
import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
|
||||||
import org.jetbrains.kotlin.gradle.tasks.locateOrRegisterTask
|
import org.jetbrains.kotlin.gradle.tasks.locateOrRegisterTask
|
||||||
@@ -434,8 +435,12 @@ fun Configuration.usesPlatformOf(target: KotlinTarget): Configuration {
|
|||||||
attributes.attribute(KotlinJsCompilerAttribute.jsCompilerAttribute, KotlinJsCompilerAttribute.legacy)
|
attributes.attribute(KotlinJsCompilerAttribute.jsCompilerAttribute, KotlinJsCompilerAttribute.legacy)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (publishJsCompilerAttribute && target is KotlinJsIrTarget && target.platformType == KotlinPlatformType.js) {
|
if (publishJsCompilerAttribute && target is KotlinJsIrTarget) {
|
||||||
attributes.attribute(KotlinJsCompilerAttribute.jsCompilerAttribute, KotlinJsCompilerAttribute.ir)
|
if (target.platformType == KotlinPlatformType.js) {
|
||||||
|
attributes.attribute(KotlinJsCompilerAttribute.jsCompilerAttribute, KotlinJsCompilerAttribute.ir)
|
||||||
|
} else {
|
||||||
|
attributes.attribute(KotlinWasmTargetAttribute.wasmTargetAttribute, KotlinWasmTargetAttribute.js)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Provide an universal way to copy attributes from the target.
|
// TODO: Provide an universal way to copy attributes from the target.
|
||||||
|
|||||||
+33
@@ -0,0 +1,33 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||||
|
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.jetbrains.kotlin.gradle.targets.js
|
||||||
|
|
||||||
|
import org.gradle.api.Named
|
||||||
|
import org.gradle.api.attributes.*
|
||||||
|
import java.io.Serializable
|
||||||
|
|
||||||
|
// For Gradle attributes
|
||||||
|
@Suppress("EnumEntryName")
|
||||||
|
enum class KotlinWasmTargetAttribute : Named, Serializable {
|
||||||
|
js;
|
||||||
|
|
||||||
|
override fun getName(): String =
|
||||||
|
name
|
||||||
|
|
||||||
|
override fun toString(): String =
|
||||||
|
getName()
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
val wasmTargetAttribute = Attribute.of(
|
||||||
|
"org.jetbrains.kotlin.wasm.target",
|
||||||
|
KotlinWasmTargetAttribute::class.java
|
||||||
|
)
|
||||||
|
|
||||||
|
fun setupAttributesMatchingStrategy(attributesSchema: AttributesSchema) {
|
||||||
|
attributesSchema.attribute(wasmTargetAttribute)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user