diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/resources/MultiplatformResourcesPublicationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/resources/MultiplatformResourcesPublicationIT.kt index a64139366e3..e9d26dcc11a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/resources/MultiplatformResourcesPublicationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/resources/MultiplatformResourcesPublicationIT.kt @@ -93,6 +93,41 @@ class MultiplatformResourcesPublicationIT : KGPBaseTest() { referenceName = "linuxX64", ) } + + @DisplayName("Multiplatform resources publication for wasm js target") + @GradleAndroidTest + fun testWasmJsTargetResourcesPublication( + gradleVersion: GradleVersion, + androidVersion: String, + providedJdk: JdkVersions.ProvidedJdk, + ) { + testEmbeddedResources( + gradleVersion, + androidVersion, + providedJdk, + publicationTask = ":publishWasmJsPublicationToMavenRepository", + publishedArchive = "build/repo/test/publication-wasm-js/1.0/publication-wasm-js-1.0-kotlin_resources.kotlin_resources.zip", + referenceName = "wasmJs", + ) + } + + @DisplayName("Multiplatform resources publication for wasm wasi target") + @GradleAndroidTest + fun testWasmWasiTargetResourcesPublication( + gradleVersion: GradleVersion, + androidVersion: String, + providedJdk: JdkVersions.ProvidedJdk, + ) { + testEmbeddedResources( + gradleVersion, + androidVersion, + providedJdk, + publicationTask = ":publishWasmWasiPublicationToMavenRepository", + publishedArchive = "build/repo/test/publication-wasm-wasi/1.0/publication-wasm-wasi-1.0-kotlin_resources.kotlin_resources.zip", + referenceName = "wasmWasi", + ) + } + private fun testEmbeddedResources( gradleVersion: GradleVersion, androidVersion: String, diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/android/projectDependency/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/android/projectDependency/build.gradle.kts index 5c77730e2c1..ef580d8bd38 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/android/projectDependency/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/android/projectDependency/build.gradle.kts @@ -36,6 +36,8 @@ kotlin { }, jvm(), linuxX64(), + wasmJs(), + wasmWasi(), ).forEach { target -> val fontsFilter = if (target is KotlinAndroidTarget) listOf("fonts/*") else emptyList() val relativeResourcePlacement = provider { File("embed/subproject") } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/build.gradle.kts index 285e13c7002..fbe42b02603 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/build.gradle.kts @@ -38,6 +38,8 @@ kotlin { linuxX64(), iosArm64(), iosSimulatorArm64(), + wasmJs(), + wasmWasi(), ).forEach { target -> val fontsFilter = if (target is KotlinAndroidTarget) listOf("fonts/*") else emptyList() val relativeResourcePlacement = provider { File("embed/${project.name}") } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmJs/embed/publication/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmJs/embed/publication/inCommon new file mode 100644 index 00000000000..7cbcb793c05 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmJs/embed/publication/inCommon @@ -0,0 +1 @@ +inCommon \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmJs/embed/publication/inner/innerInCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmJs/embed/publication/inner/innerInCommon new file mode 100644 index 00000000000..17f24c06452 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmJs/embed/publication/inner/innerInCommon @@ -0,0 +1 @@ +innerInCommon \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmJs/embed/publication/inner/platformOverride b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmJs/embed/publication/inner/platformOverride new file mode 100644 index 00000000000..c6c686df399 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmJs/embed/publication/inner/platformOverride @@ -0,0 +1 @@ +wasmJsOverride \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmJs/embed/publication/onlyInWasmJs b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmJs/embed/publication/onlyInWasmJs new file mode 100644 index 00000000000..182f627d6d2 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmJs/embed/publication/onlyInWasmJs @@ -0,0 +1 @@ +onlyInWasmJs \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmWasi/embed/publication/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmWasi/embed/publication/inCommon new file mode 100644 index 00000000000..7cbcb793c05 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmWasi/embed/publication/inCommon @@ -0,0 +1 @@ +inCommon \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmWasi/embed/publication/inner/innerInCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmWasi/embed/publication/inner/innerInCommon new file mode 100644 index 00000000000..17f24c06452 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmWasi/embed/publication/inner/innerInCommon @@ -0,0 +1 @@ +innerInCommon \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmWasi/embed/publication/inner/platformOverride b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmWasi/embed/publication/inner/platformOverride new file mode 100644 index 00000000000..d725261dddd --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmWasi/embed/publication/inner/platformOverride @@ -0,0 +1 @@ +wasmWasiOverride \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmWasi/embed/publication/onlyInWasmWasi b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmWasi/embed/publication/onlyInWasmWasi new file mode 100644 index 00000000000..0f1bbae1eb4 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/wasmWasi/embed/publication/onlyInWasmWasi @@ -0,0 +1 @@ +onlyInWasmWasi \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/src/wasmJsMain/multiplatformResources/inner/platformOverride b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/src/wasmJsMain/multiplatformResources/inner/platformOverride new file mode 100644 index 00000000000..c6c686df399 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/src/wasmJsMain/multiplatformResources/inner/platformOverride @@ -0,0 +1 @@ +wasmJsOverride \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/src/wasmJsMain/multiplatformResources/onlyInWasmJs b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/src/wasmJsMain/multiplatformResources/onlyInWasmJs new file mode 100644 index 00000000000..182f627d6d2 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/src/wasmJsMain/multiplatformResources/onlyInWasmJs @@ -0,0 +1 @@ +onlyInWasmJs \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/src/wasmWasiMain/multiplatformResources/inner/platformOverride b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/src/wasmWasiMain/multiplatformResources/inner/platformOverride new file mode 100644 index 00000000000..d725261dddd --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/src/wasmWasiMain/multiplatformResources/inner/platformOverride @@ -0,0 +1 @@ +wasmWasiOverride \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/src/wasmWasiMain/multiplatformResources/onlyInWasmWasi b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/src/wasmWasiMain/multiplatformResources/onlyInWasmWasi new file mode 100644 index 00000000000..0f1bbae1eb4 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/src/wasmWasiMain/multiplatformResources/onlyInWasmWasi @@ -0,0 +1 @@ +onlyInWasmWasi \ No newline at end of file