azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable resources processing for Kotlin/JS target in MPP

Browse Source 
Issue #KT-28363 Fixed
This commit is contained in:
Sergey Igushkin
2018-11-22 12:11:28 +03:00
parent 4dd95e331f
commit 5c5c161d59
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
+1 -1
View File
@@ -190,7 +190,7 @@ class NewMultiplatformIT : BaseGradleIT() {
@Test @Test
fun testResourceProcessing() = with(Project("sample-lib", gradleVersion, "new-mpp-lib-and-app")) { fun testResourceProcessing() = with(Project("sample-lib", gradleVersion, "new-mpp-lib-and-app")) {
val targetsWithResources = listOf("jvm6", "wasm32", nativeHostTargetName) val targetsWithResources = listOf("jvm6", "nodeJs", "wasm32", nativeHostTargetName)
val processResourcesTasks = val processResourcesTasks =
targetsWithResources.map { ":${it}ProcessResources" } targetsWithResources.map { ":${it}ProcessResources" }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt
+4 -1
View File
@@ -263,7 +263,10 @@ class KotlinJvmAndroidCompilation(
class KotlinJsCompilation( class KotlinJsCompilation(
target: KotlinTarget, target: KotlinTarget,
name: String name: String
) : AbstractKotlinCompilationToRunnableFiles<KotlinJsOptions>(target, name) { ) : AbstractKotlinCompilationToRunnableFiles<KotlinJsOptions>(target, name), KotlinCompilationWithResources<KotlinJsOptions> {
override val processResourcesTaskName: String
get() = disambiguateName("processResources")
override val compileKotlinTask: Kotlin2JsCompile override val compileKotlinTask: Kotlin2JsCompile
get() = super.compileKotlinTask as Kotlin2JsCompile get() = super.compileKotlinTask as Kotlin2JsCompile
} }