Update ImageViewer example according to PR discussion

2 weeks ago · 9a6a939bfb
10 changed files with 20 additions and 16 deletions
--- a/examples/imageviewer/NOTICE.md
+++ b/examples/imageviewer/NOTICE.md
@ -0,0 +1,2 @@
+
+[dummy_map.jpg](./shared/src/commonMain/composeResources/drawable/dummy_map.jpg) is available under Open Database License: https://www.openstreetmap.org/copyright
--- a/examples/imageviewer/gradle.properties
+++ b/examples/imageviewer/gradle.properties
@ -2,7 +2,10 @@ kotlin.code.style=official
 xcodeproj=iosApp
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx3g
-org.gradle.configuration-cache=true
+
+# TODO: enable configuration cache once we update on kotlin 2.0
+# see https://youtrack.jetbrains.com/issue/KT-64851 (k/wasm issue)
+org.gradle.configuration-cache=false
 org.gradle.caching=true
 org.jetbrains.compose.experimental.jscanvas.enabled=true
 org.jetbrains.compose.experimental.macos.enabled=true
--- a/examples/imageviewer/shared/src/commonMain/composeResources/drawable/dummy_map.jpg
+++ b/examples/imageviewer/shared/src/commonMain/composeResources/drawable/dummy_map.jpg
--- a/examples/imageviewer/shared/src/commonMain/composeResources/drawable/dummy_map.png
+++ b/examples/imageviewer/shared/src/commonMain/composeResources/drawable/dummy_map.png
--- a/examples/imageviewer/webApp/build.gradle.kts
+++ b/examples/imageviewer/webApp/build.gradle.kts
@ -11,9 +11,9 @@ val copyJsResources = tasks.create("copyJsResourcesWorkaround", Copy::class.java
    into("build/processedResources/js/main")
 }

-tasks.withType<DefaultIncrementalSyncTask> {
-    dependsOn(copyJsResources)
-}
+//tasks.withType<DefaultIncrementalSyncTask> {
+//    dependsOn(copyJsResources)
+//}

 val copyWasmResources = tasks.create("copyWasmResourcesWorkaround", Copy::class.java) {
    from(project(":shared").file("src/commonMain/composeResources"))
@ -21,9 +21,10 @@ val copyWasmResources = tasks.create("copyWasmResourcesWorkaround", Copy::class.
 }

 afterEvaluate {
-    project.tasks.getByName("jsProcessResources").finalizedBy(copyJsResources)
-    project.tasks.getByName("wasmJsProcessResources").finalizedBy(copyWasmResources)
-    project.tasks.getByName("wasmJsDevelopmentExecutableCompileSync").dependsOn(copyWasmResources)
+//    project.tasks.getByName("jsProcessResources").finalizedBy(copyJsResources)
+//    project.tasks.getByName("wasmJsProcessResources").finalizedBy(copyWasmResources)
+//    project.tasks.getByName("wasmJsDevelopmentExecutableCompileSync").dependsOn(copyWasmResources)
+//    project.tasks.getByName("wasmJsProductionExecutableCompileSync").dependsOn(copyWasmResources)
 }

 val rootDirPath = project.rootDir.path
--- a/examples/imageviewer/webApp/src/jsMain/resources/index.html
+++ b/examples/imageviewer/webApp/src/jsMain/resources/index.html
@ -2,6 +2,7 @@
 <html lang="en">
 <head>
    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>ImageViewer</title>
    <script src="skiko.js"> </script>
 </head>
--- a/examples/imageviewer/webApp/src/wasmJsMain/resources/index.html
+++ b/examples/imageviewer/webApp/src/wasmJsMain/resources/index.html
@ -2,9 +2,8 @@
 <html lang="en">
 <head>
    <meta charset="UTF-8">
-
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Image Viewer (Kotlin/Wasm)</title>
-    <script type="application/javascript" src="skiko.js"></script>
    <script type="application/javascript" src="webApp.js"></script>
    <style>
        html, body {
--- a/examples/imageviewer/webApp/src/wasmJsMain/resources/load.mjs
+++ b/examples/imageviewer/webApp/src/wasmJsMain/resources/load.mjs
@ -1,5 +0,0 @@
-import { instantiate } from './imageviewer.uninstantiated.mjs';
-
-await wasmSetup;
-
-instantiate({ skia: Module['asm'] });
--- a/examples/jetsnack/gradle.properties
+++ b/examples/jetsnack/gradle.properties
@ -5,5 +5,9 @@ agp.version=8.0.2
 kotlin.version=1.9.23
 compose.version=1.6.2

+# TODO: enable configuration cache once we update on kotlin 2.0
+# see https://youtrack.jetbrains.com/issue/KT-64851 (k/wasm issue)
+org.gradle.configuration-cache=false
+
 #Compose for Web is Experimental
 org.jetbrains.compose.experimental.wasm.enabled=true
--- a/examples/jetsnack/web/src/wasmJsMain/resources/index.html
+++ b/examples/jetsnack/web/src/wasmJsMain/resources/index.html
@ -2,9 +2,8 @@
 <html lang="en">
 <head>
    <meta charset="UTF-8">
-
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>JetSnack with Kotlin/Wasm</title>
-    <script type="application/javascript" src="skiko.js"></script>
    <script type="application/javascript" src="jetsnackwasmapp.js"></script>
    <style>
        html, body {
				`@ -0,0 +1,2 @@`

				`[dummy_map.jpg](./shared/src/commonMain/composeResources/drawable/dummy_map.jpg) is available under Open Database License: https://www.openstreetmap.org/copyright`