From 909da465ec08f85cd193f4c6b40375d7ef1a96f3 Mon Sep 17 00:00:00 2001 From: issamux Date: Tue, 11 Jun 2024 17:48:41 -0400 Subject: [PATCH 1/3] [ImageViewer] Add kotlin folder to git ignore list --- examples/imageviewer/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/imageviewer/.gitignore b/examples/imageviewer/.gitignore index d27dff7cb0f..ba824906254 100644 --- a/examples/imageviewer/.gitignore +++ b/examples/imageviewer/.gitignore @@ -19,3 +19,4 @@ iosApp/iosApp.xcworkspace/* iosApp/iosApp.xcodeproj/* !iosApp/iosApp.xcodeproj/project.pbxproj shared/shared.podspec +.kotlin/ \ No newline at end of file From 732ef15669d43467f1ef1bf877d8d3f643af6db5 Mon Sep 17 00:00:00 2001 From: issamux Date: Tue, 11 Jun 2024 17:49:18 -0400 Subject: [PATCH 2/3] [wasm/ImageViewer] Set different namespace for js and wasm resolving build issue --- examples/imageviewer/webApp/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/imageviewer/webApp/build.gradle.kts b/examples/imageviewer/webApp/build.gradle.kts index 52f28985efe..f2c5a6a2618 100644 --- a/examples/imageviewer/webApp/build.gradle.kts +++ b/examples/imageviewer/webApp/build.gradle.kts @@ -12,7 +12,7 @@ val rootDirPath = project.rootDir.path kotlin { js { - moduleName = "imageviewer" + moduleName = "imageviewer-wa-js" browser { commonWebpackConfig { outputFileName = "imageviewer.js" @@ -24,7 +24,7 @@ kotlin { @OptIn(ExperimentalWasmDsl::class) wasmJs { - moduleName = "imageviewer" + moduleName = "imageviewer-wa-wasm" browser { // TODO: uncomment when https://youtrack.jetbrains.com/issue/KT-68614 is fixed (it doesn't work with configuration cache) // commonWebpackConfig { From 222ef6b184c44bf153ab256481a577ba83562182 Mon Sep 17 00:00:00 2001 From: issamux Date: Tue, 11 Jun 2024 17:49:44 -0400 Subject: [PATCH 3/3] [wasm/ImageViewer] Remove unresolved JsModule annotation --- .../src/jsWasmMain/kotlin/example/imageviewer/utils/uuid.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/imageviewer/shared/src/jsWasmMain/kotlin/example/imageviewer/utils/uuid.kt b/examples/imageviewer/shared/src/jsWasmMain/kotlin/example/imageviewer/utils/uuid.kt index f2578cfdfef..76b7d234d4b 100644 --- a/examples/imageviewer/shared/src/jsWasmMain/kotlin/example/imageviewer/utils/uuid.kt +++ b/examples/imageviewer/shared/src/jsWasmMain/kotlin/example/imageviewer/utils/uuid.kt @@ -1,6 +1,5 @@ package example.imageviewer.utils -@JsModule("uuid") external object UUID { fun v4(): String } \ No newline at end of file